huashan: Cleanup