Completely separate out validation code
Fix bug in 1984544
Fix bug in ca25734
Deal with token removal by class
Replace order