working towards cleaning up storage interfaces
more storage cleanup