Fix storage write and remove