Storage cleanup - mostly upgrades...