Remove TODO from datastore.entity.