Cleaned up the server