Remove unnecessary blobstore references