Remove legacy storage types