Clean up storage code