rhine: cleanup recovery stuff

Change-Id: I4165d43d4f7d8afe9dc65ec7e5de3f1cadef9335