Tidy up server app