Clean up server.h