Response to CR

Switched upgrade info to use cookies, renamed variables, removed a migration, fixed tests and javascript