fixed removing incompatible tokens
Merge branch 'master' of https://github.com/Systematical/Amnesident