Code cleanup for traitors