Moved the last stuff away from ConfServer.