CORE-2244 code changes moved remove token line to end of method