Enhancement validate storage

Adds the storage equivalent functionality of PR #7.

DEPENDS: PR #7 
Partially CLOSES: Issues #2, #3 
no, it wouldn't.

An 'if' would only remove one instance from the list as L544 only removes one entry at a time. The while ensures that all instances are removed. In most cases it should only be one round - equivalent to an 'if' - but if the list got messed up then this ensures it still gets cleaned up properly.