Fix recovery
Remove dead code