Cleanup per session with John P.
Client side cleanups (mostly) per John P.