Code cleanup in server module.