Misc Touchup
Remove tokens for now