Remove TODO from datastore.helpers.