Remove references to non-implemented Storage module (resubmitted)

Remove any and all references to old (non-working, non-implemented) storage engine.

Resubmitted against maint branch