Standardizing ObjectStore samples

Yeah, I agree - I'll remove