Removed custom datastore object