more cleanup in db modules