treatRawData removed from Datastore