Fixed token removal bug.