Cleanup DatabaseUtils