diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index c2d50b420f390d34aa02d9719753b3946fc22ec1..0000000000000000000000000000000000000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "src/xbob.blitz"]
-	path = src/xbob.blitz
-	url = git@github.com:anjos/xbob.blitz
diff --git a/buildout.cfg b/buildout.cfg
index 003fdb526d24eeac1862741b0cbd143a226f15cd..ac5d7416f165c2c0d469814d195a680c6bff96d7 100644
--- a/buildout.cfg
+++ b/buildout.cfg
@@ -8,13 +8,15 @@ eggs = xbob.io
        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.blitz]
 recipe = xbob.buildout:develop
diff --git a/src/xbob.blitz b/src/xbob.blitz
deleted file mode 160000
index 0d673b4ee902a13de8806236410e1aabb7188898..0000000000000000000000000000000000000000
--- a/src/xbob.blitz
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 0d673b4ee902a13de8806236410e1aabb7188898