Removed remaining server.h code