roll back some unneeded changes
move all recovery settings to RecoverySettings