Remove reference to ObjectStore