diff --git a/.gitmodules b/.gitmodules
index a532105..fa23cdb 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,7 +1,3 @@
-[submodule "sombin"]
-	path = submodules/sombin
-	url = git@github.com:sorgom/sombin.git
-	branch = dev
 [submodule "sompy"]
 	path = submodules/sompy
 	url = git@github.com:sorgom/sompy.git
diff --git a/make/setup.cmd b/make/setup.cmd
index 363d9c8..dd85e90 100644
--- a/make/setup.cmd
+++ b/make/setup.cmd
@@ -9,7 +9,6 @@ set rootDir=%cd%
 set testsDir=%cd%\tests
 set srcDir=%cd%\code
 set buildDir=%cd%\build
-set binDir=%cd%\submodules\sombin
 set pyDir=%cd%\submodules\sompy
 set reportsDir=%CD%\reports_%tool%
 
@@ -27,7 +26,8 @@ md %buildDir% 2>NUL
 
 set optsTxt=%myDir%\options.txt
 
-%binDir%\docopts.exe %optsTxt% %* > %tmpCmd%
+%pyDir%\somutil\docopts.py %optsTxt% %* > %tmpCmd%
+if %errorlevel% neq 0 exit /b 1
 call %tmpCmd%
 del %tmpCmd% 2>NUL
 
diff --git a/submodules/sombin b/submodules/sombin
deleted file mode 160000
index 784ae01..0000000
--- a/submodules/sombin
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 784ae01b02461e246b7e2fc3969bf3a9173aa4c4
diff --git a/submodules/sompy b/submodules/sompy
index 8f99f9e..0e167f8 160000
--- a/submodules/sompy
+++ b/submodules/sompy
@@ -1 +1 @@
-Subproject commit 8f99f9e969620e5fdda8f77152918a9a29fe7a6c
+Subproject commit 0e167f8c8d3b9e3f776d3252b87ac37e64f26a92