recovery: cleanup and correct settings