Remove DOM Storage dependency