cleaning up the server a little