diff --git a/bob/bio/face/config/database/mobio_female.py b/bob/bio/face/config/database/mobio_female.py
deleted file mode 100644
index a329d9224502429d26ae985df052f0fec95eb131..0000000000000000000000000000000000000000
--- a/bob/bio/face/config/database/mobio_female.py
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env python
-
-from bob.bio.face.database import MobioBioDatabase
-
-mobio_image_directory = "[YOUR_MOBIO_IMAGE_DIRECTORY]"
-mobio_annotation_directory = "[YOUR_MOBIO_ANNOTATION_DIRECTORY]"
-
-database = MobioBioDatabase(
-    original_directory=mobio_image_directory,
-    original_extension=".png",
-    annotation_directory=mobio_annotation_directory,
-    annotation_type="eyecenter",
-
-    protocol = 'female',
-    models_depend_on_protocol=True,
-
-    all_files_options={'gender': 'female'},
-    extractor_training_options={'gender': 'female'},
-    projector_training_options={'gender': 'female'},
-    enroller_training_options={'gender': 'female'},
-    z_probe_options={'gender': 'female'}
-)
diff --git a/bob/bio/face/config/database/mobio_image.py b/bob/bio/face/config/database/mobio_image.py
deleted file mode 100644
index b754e6f727190001126ecf58434ffef13bbe7c1f..0000000000000000000000000000000000000000
--- a/bob/bio/face/config/database/mobio_image.py
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env python
-
-from bob.bio.face.database import MobioBioDatabase
-
-mobio_image_directory = "[YOUR_MOBIO_IMAGE_DIRECTORY]"
-mobio_annotation_directory = "[YOUR_MOBIO_ANNOTATION_DIRECTORY]"
-
-database = MobioBioDatabase(
-    original_directory=mobio_image_directory,
-    original_extension=".png",
-    annotation_directory=mobio_annotation_directory,
-    annotation_type="eyecenter",
-
-    protocol='male',
-    models_depend_on_protocol = True,
-)
-
-
-
-
diff --git a/bob/bio/face/config/database/mobio_male.py b/bob/bio/face/config/database/mobio_male.py
deleted file mode 100644
index 90da21e23b1580aa000870b830a61dbd5e54a3b2..0000000000000000000000000000000000000000
--- a/bob/bio/face/config/database/mobio_male.py
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env python
-
-from bob.bio.face.database import MobioBioDatabase
-
-mobio_image_directory = "[YOUR_MOBIO_IMAGE_DIRECTORY]"
-mobio_annotation_directory = "[YOUR_MOBIO_ANNOTATION_DIRECTORY]"
-
-database = MobioBioDatabase(
-    original_directory=mobio_image_directory,
-    original_extension=".png",
-    annotation_directory=mobio_annotation_directory,
-    annotation_type="eyecenter",
-
-    protocol='male',
-    models_depend_on_protocol = True,
-
-    all_files_options={'gender': 'male'},
-    extractor_training_options={'gender': 'male'},
-    projector_training_options={'gender': 'male'},
-    enroller_training_options={'gender': 'male'},
-    z_probe_options={'gender': 'male'}
-)
-
diff --git a/bob/bio/face/database/mobio.py b/bob/bio/face/database/mobio.py
index 94c797475f4b815f96e3ef9b61359e488d53064d..887d1c049810fb26c0f8f20d3a2b8b773369e35c 100644
--- a/bob/bio/face/database/mobio.py
+++ b/bob/bio/face/database/mobio.py
@@ -11,7 +11,7 @@
 
 
 from .database import FaceBioFile
-from bob.bio.base.database import ZTBioDatabase, BioFile
+from bob.bio.base.database import ZTBioDatabase
 
 
 class MobioBioDatabase(ZTBioDatabase):
diff --git a/develop.cfg b/develop.cfg
index b786533e7b8207d56505c418979e00adaa181ac0..45b23b26e60ad7602a98b3923bcd0b47bfeb4a6a 100644
--- a/develop.cfg
+++ b/develop.cfg
@@ -27,15 +27,16 @@ eggs = bob.extension
        bob.db.arface
        bob.db.banca
        bob.db.caspeal
+       bob.db.cuhk_cufs
        bob.db.frgc
        bob.db.gbu
        bob.db.lfw
        bob.db.mobio
        bob.db.multipie
-       bob.db.scface
-       bob.db.xm2vts
        bob.db.replay
        bob.db.replaymobile
+       bob.db.scface
+       bob.db.xm2vts
        gridtk
        bob.bio.base
        bob.bio.face
@@ -66,15 +67,16 @@ develop = src/bob.extension
           src/bob.db.arface
           src/bob.db.banca
           src/bob.db.caspeal
+          src/bob.db.cuhk_cufs
           src/bob.db.frgc
           src/bob.db.gbu
           src/bob.db.lfw
           src/bob.db.mobio
           src/bob.db.multipie
-          src/bob.db.scface
-          src/bob.db.xm2vts
           src/bob.db.replay
           src/bob.db.replaymobile
+          src/bob.db.scface
+          src/bob.db.xm2vts
           src/gridtk
           src/bob.bio.base
           src/bob.bio.face
@@ -109,15 +111,16 @@ bob.db.atnt = git https://gitlab.idiap.ch/bob/bob.db.atnt
 bob.db.arface = git https://gitlab.idiap.ch/bob/bob.db.arface
 bob.db.banca = git https://gitlab.idiap.ch/bob/bob.db.banca
 bob.db.caspeal = git https://gitlab.idiap.ch/bob/bob.db.caspeal
+bob.db.cuhk_cufs = git https://gitlab.idiap.ch/bob/bob.db.cuhk_cufs
 bob.db.frgc = git https://gitlab.idiap.ch/bob/bob.db.frgc
 bob.db.gbu = git https://gitlab.idiap.ch/bob/bob.db.gbu
 bob.db.lfw = git https://gitlab.idiap.ch/bob/bob.db.lfw
 bob.db.mobio = git https://gitlab.idiap.ch/bob/bob.db.mobio
 bob.db.multipie = git https://gitlab.idiap.ch/bob/bob.db.multipie
-bob.db.scface = git https://gitlab.idiap.ch/bob/bob.db.scface
-bob.db.xm2vts = git https://gitlab.idiap.ch/bob/bob.db.xm2vts
 bob.db.replay = git https://gitlab.idiap.ch/bob/bob.db.replay
 bob.db.replaymobile = git https://gitlab.idiap.ch/bob/bob.db.replaymobile
+bob.db.scface = git https://gitlab.idiap.ch/bob/bob.db.scface
+bob.db.xm2vts = git https://gitlab.idiap.ch/bob/bob.db.xm2vts
 gridtk = git https://gitlab.idiap.ch/bob/gridtk
 bob.bio.base = git https://gitlab.idiap.ch/bob/bob.bio.base
 bob.bio.face = git https://gitlab.idiap.ch/bob/bob.bio.face
diff --git a/setup.py b/setup.py
index eb06f3bd38a87a20c332b60d2d8848b2862f8085..9f800b5664f848b1f608293fb175bf0d9dcf1035 100644
--- a/setup.py
+++ b/setup.py
@@ -109,15 +109,16 @@ setup(
 
         'bob.bio.database': [
             'arface            = bob.bio.face.config.database.arface:database',
-            'atnt              = bob.bio.face.config.database.atnt:database',            
+            'atnt              = bob.bio.face.config.database.atnt:database',
             'banca             = bob.bio.face.config.database.banca_english:database',
             'caspeal           = bob.bio.face.config.database.caspeal:database',
             'frgc              = bob.bio.face.config.database.frgc:database',
             'gbu               = bob.bio.face.config.database.gbu:database',
             'lfw-restricted    = bob.bio.face.config.database.lfw_restricted:database',
             'lfw-unrestricted  = bob.bio.face.config.database.lfw_unrestricted:database',
-            'mobio-male        = bob.bio.face.config.database.mobio_male:database',  # MOBIO gender-dependent training
-            'mobio-female      = bob.bio.face.config.database.mobio_female:database',  # MOBIO gender-dependent training
+            'mobio-image       = bob.bio.face.config.database.mobio:mobio_image',
+            'mobio-male        = bob.bio.face.config.database.mobio:mobio_male',  # MOBIO gender-dependent training
+            'mobio-female      = bob.bio.face.config.database.mobio:mobio_female',  # MOBIO gender-dependent training
             'multipie          = bob.bio.face.config.database.multipie:database',
             'multipie-pose     = bob.bio.face.config.database.multipie_pose:database',
             'scface            = bob.bio.face.config.database.scface:database',