Improve cleanup behaviour around new connections