Tried to clean up disconnects