Some cleaning of RawStore