class updates/database class cleanup