Start of cleaning of DbRecord & DbEntity classes