correct trace output
simplify testcase: remove all unused tokens