dev/core#2748 Remove unused token assigns