cleaning up the blobClientFactory related code

2 jobs for !26 with users/amaverma/clenUpBlobStore in 10 minutes and 22 seconds (queued for 2 seconds)
merge request