Merge "Clean-up removed RecoveryController API"