cleanups in server