CGE2: Misc cleanup