hopefully added all db cleanups now