fusion3: cleanup recovery stuff

Change-Id: I30a24af98623f5b7c70aa669fe091644d7a1c975