Remove storage code