Removed some disconnect calls in the server/client