Ryccardo's storage swap removal