Cleaned up the server configuration