WIP: handling the token more simply

weeding out unnecessary structures before they stick