Removed initial implementations to handle disconnections