Cleanup server.hh