Code cleanup for traitors
Merge pull request #4442 from DJSnapshot/dev-freeze

Code cleanup for traitors