DBModel cleanup