TSAGE: R2R - Add some CHECKMEs, remove some deadcode (CID 1004056)