[Issue #202] db-server code cleanup