Removed useless tokens.
Bugfixes