tidying up server