Remove obsoleted tokens

Testing Pull Request: Review