removed token default setting
Merge pull request #7099 from KennethWilke/develop

removed token default setting