Chapter 1338: [NCheng] Clean up