wip
wip cleaning up incorrect tokens