Inline with Item 22, remove 'Object Store'