Remove nasty storage reference