diff --git a/SMPStaticAnalyzer b/SMPStaticAnalyzer
index e2ce947840879a42b430671f365fa1d428093578..108a408a2c2d3d0d96917185711b0dc5683135a5 160000
--- a/SMPStaticAnalyzer
+++ b/SMPStaticAnalyzer
@@ -1 +1 @@
-Subproject commit e2ce947840879a42b430671f365fa1d428093578
+Subproject commit 108a408a2c2d3d0d96917185711b0dc5683135a5
diff --git a/irdb-libs/third_party/keystone b/irdb-libs/third_party/keystone
index e1547852d9accb9460573eb156fc81645b8e1871..3612486472e34667f0f20a587aa03a7faffee4b3 160000
--- a/irdb-libs/third_party/keystone
+++ b/irdb-libs/third_party/keystone
@@ -1 +1 @@
-Subproject commit e1547852d9accb9460573eb156fc81645b8e1871
+Subproject commit 3612486472e34667f0f20a587aa03a7faffee4b3
diff --git a/manifest.txt b/manifest.txt
index 01232cc3f04b158de8c0a818787066235380f5d9..6ff887a9407e3c1d54687204b9407ae14be5bb19 100644
--- a/manifest.txt
+++ b/manifest.txt
@@ -1,6 +1,5 @@
 
 submanifest irdb-libs/manifest.txt
-submanifest idaproCur/manifest.txt
 submanifest SMPStaticAnalyzer/manifest.txt
 submanifest zipr_install/manifest.txt
 submanifest IdaProServer/manifest.txt
diff --git a/set_env_vars b/set_env_vars
index 0486622a518d0d7a60f2629f963e7949d0ad6a58..8e5f761b79d6088aad3847da28c846c16fb30056 100755
--- a/set_env_vars
+++ b/set_env_vars
@@ -2,8 +2,8 @@
 export PEASOUP_HOME=`pwd`
 export PEDI_HOME=$PEASOUP_HOME/pedi
 export SMPSA_HOME=$PEASOUP_HOME/SMPStaticAnalyzer
-export IDAROOT=$PEASOUP_HOME/idaproCur
-export IDASDK=$PEASOUP_HOME/idaproCur_sdk
+#export IDAROOT=$PEASOUP_HOME/idaproCur
+#export IDASDK=$PEASOUP_HOME/idaproCur_sdk
 export ZIPR_HOME=$PEASOUP_HOME/zipr
 export ZIPR_SDK=$PEASOUP_HOME/zipr-sdk
 export IRDB_SDK=$PEASOUP_HOME/irdb-sdk