Blobs update and clean up

Blobs update and clean up