Removed cookie upgrader
Removed superfluous comments