The metakey and quotas get set by the storage operator and some cleanups

Recreates the accidentally merged pull request