Moar Storage cleanup