Another cleaning pass through Disasters and Storage scripts.