Merge "Remove stale session cleanups during tests" into nyc-dev