diff --git a/.gitmodules b/.gitmodules
index f8648b8..e69de29 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +0,0 @@
-[submodule "app/code/local/Cm/RedisSession/lib"]
-	path = app/code/local/Cm/RedisSession/lib
-	url = https://github.com/colinmollenhour/php-redis-session-abstract
-[submodule "app/code/local/Credis"]
-	path = app/code/local/Credis
-	url = https://github.com/colinmollenhour/credis
diff --git a/app/code/local/Cm/RedisSession/Model/Session.php b/app/code/local/Cm/RedisSession/Model/Session.php
index 5c14563..409a1c5 100644
--- a/app/code/local/Cm/RedisSession/Model/Session.php
+++ b/app/code/local/Cm/RedisSession/Model/Session.php
@@ -29,16 +29,6 @@
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-// Modman install will have files in module directory (submodule) and composer install
-// will have files in vendor directory with autoloader registered
-if (is_dir(__DIR__.'/../lib/src/Cm/RedisSession')) {
-    require_once __DIR__.'/../lib/src/Cm/RedisSession/Handler/ConfigInterface.php';
-    require_once __DIR__.'/../lib/src/Cm/RedisSession/Handler/LoggerInterface.php';
-    require_once __DIR__.'/../lib/src/Cm/RedisSession/Handler.php';
-    require_once __DIR__.'/../lib/src/Cm/RedisSession/ConnectionFailedException.php';
-    require_once __DIR__.'/../lib/src/Cm/RedisSession/ConcurrentConnectionsExceededException.php';
-}
-
 class Cm_RedisSession_Model_Session implements \Zend_Session_SaveHandler_Interface
 {
 
diff --git a/app/code/local/Cm/RedisSession/etc/config.xml b/app/code/local/Cm/RedisSession/etc/config.xml
index bcf2b20..2c19b32 100644
--- a/app/code/local/Cm/RedisSession/etc/config.xml
+++ b/app/code/local/Cm/RedisSession/etc/config.xml
@@ -38,11 +38,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   </modules>
   <global>
     <models>
-      <core_resource>
-        <rewrite>
-          <session>Cm_RedisSession_Model_Session</session>
-        </rewrite>
-      </core_resource>
+      <cm_redissession>
+        <class>Cm_RedisSession_Model</class>
+      </cm_redissession>
     </models>
   </global>
 </config>
diff --git a/app/code/local/Cm/RedisSession/lib b/app/code/local/Cm/RedisSession/lib
deleted file mode 160000
index 4cb15d5..0000000
--- a/app/code/local/Cm/RedisSession/lib
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 4cb15d557f58f45ad257cbcce3c12511e6deb5bc
diff --git a/app/code/local/Credis b/app/code/local/Credis
deleted file mode 160000
index 049ccfb..0000000
--- a/app/code/local/Credis
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 049ccfb2c680e4dfa6adcfa97f2f29d086919abd