more db cleanup