tidy up ServerStuff.java