remove dependency on cookies