reverted some changes around token in Auth