shell: Remove options for old token storage
shell: Fix issue with --no-check-certificate not actually doing anything