jingfeng cleanup code