Removed check for restarting the client