more db backend cleanups