removed original record, querybuilder, collection classes