server: code cleanups