cleaned the messes --jingzbu