diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 8bbc97b6642c0b9ade2dc904d5b87ab4a951f359..0000000000000000000000000000000000000000
--- a/.gitmodules
+++ /dev/null
@@ -1,6 +0,0 @@
-[submodule "src/xbob.blitz"]
-	path = src/xbob.blitz
-	url = git@github.com:anjos/xbob.blitz
-[submodule "src/xbob.io"]
-	path = src/xbob.io
-	url = git@github.com:anjos/xbob.io
diff --git a/buildout.cfg b/buildout.cfg
index 13e6f1054b53a6630f5d1873025eb76be097172b..171a75274f0b7666f849bd7c36e0e4733a118a14 100644
--- a/buildout.cfg
+++ b/buildout.cfg
@@ -8,13 +8,16 @@ eggs = xbob.learn.activation
        ipdb
 extensions = mr.developer
 auto-checkout = *
-prefixes = /idiap/group/torch5spro/nightlies/last/install/linux-x86_64-release
+;prefixes = /idiap/group/torch5spro/nightlies/last/install/linux-x86_64-release
+prefixes = /Users/andre/work/bob/b/dbg
 debug = true
 verbose = true
 
 [sources]
 xbob.buildout = git git@github.com:bioidiap/xbob.buildout
 xbob.extension = git git@github.com:bioidiap/xbob.extension branch=xbob
+xbob.blitz = git git@github.com:anjos/xbob.blitz egg=false
+xbob.io = git git@github.com:anjos/xbob.io egg=false
 
 [xbob.blitz]
 recipe = xbob.buildout:develop
@@ -24,11 +27,11 @@ eggs = xbob.buildout xbob.extension
 [xbob.io]
 recipe = xbob.buildout:develop
 setup = src/xbob.io
-eggs = xbob.blitz xbob.buildout xbob.extension
+eggs = xbob.blitz
 
 [xbob.learn.activation]
 recipe = xbob.buildout:develop
-eggs = xbob.blitz xbob.io xbob.buildout xbob.extension
+eggs = xbob.io
 
 [scripts]
 recipe = xbob.buildout:scripts
diff --git a/src/xbob.blitz b/src/xbob.blitz
deleted file mode 160000
index e7e6777db859c80d45093d5ce71bde2f6ee63816..0000000000000000000000000000000000000000
--- a/src/xbob.blitz
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e7e6777db859c80d45093d5ce71bde2f6ee63816
diff --git a/src/xbob.io b/src/xbob.io
deleted file mode 160000
index b919404de7021dd8b401a0f384e68756eda8f6da..0000000000000000000000000000000000000000
--- a/src/xbob.io
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b919404de7021dd8b401a0f384e68756eda8f6da