Connection time cleanups