Remove unnecessary blobstore references

This is a cleanup PR to remove blobstore references that are not required.