Removed unnecessary datastore retrieval