cleanup, zhuomingliang++