Remove some references to the server.