huashan: cleanup recovery stuff

Change-Id: Ia4174ac181370bf3dffca5644441f2928f2795a5