More tidying of server.