[Yujun] Clean up code.