Clean up connectionListener.connectionOpened logic