added more db cleanup steps