Clean up Server code