server: Cleanups