Cleaned the server a bit