tidy up server
more sanity