This was an experiment. Removing this code.
Ability to provide other sources of storage.
Comments and cleanup