remove optimize_storage