remove extra setting from backport of optional token