cleaning up the server portion