More db_utils cleanup