cleanup of server.rb