Removed more deprecated classes (referencing DataStore1/DbicLink1)