recovery_keys: Remove deprecated code and cleanup