Remove TODO entries and clean up ActiveSession models from parts of code that were supposed to be removed in 13.7.