diff --git a/bob/learn/em/factor_analysis.py b/bob/learn/em/factor_analysis.py
index cd9a769553b5a41368aa11ece53c35045a31e1a4..9b9a8894d56e530e661149e7d7f7e81760cb3926 100644
--- a/bob/learn/em/factor_analysis.py
+++ b/bob/learn/em/factor_analysis.py
@@ -231,8 +231,7 @@ class FactorAnalysisBase(BaseEstimator):
 
         if self.ubm is None:
             logger.info("Creating a new GMMMachine and training it.")
-            gmm_class = self.ubm_kwargs.pop("gmm_class", GMMMachine)
-            self.ubm: GMMMachine = gmm_class(**self.ubm_kwargs)
+            self.ubm = GMMMachine(**self.ubm_kwargs)
             self.ubm.fit(X)
 
         if self.ubm._means is None:
diff --git a/doc/extra-intersphinx.txt b/doc/extra-intersphinx.txt
deleted file mode 100644
index e0c2a1af70a9f804401fb9c4654cb2338090983c..0000000000000000000000000000000000000000
--- a/doc/extra-intersphinx.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-# The bob.core>2.0.5 in the requirements.txt is making the bob.core not download
-bob.core