Better cleanup of server/sockets
Waiting for server to become idle