some server side clean-up