remove variableTokenSorts and related visitors