connection mode clean up fixed