Remove dependence on cookies