Remove unnecessary TokenData clones