server cleanups