Remove dependence on $.data