I was in the middle of getting rid of to_token calls