diff --git a/.gitmodules b/.gitmodules
index 0dcfcf7..decb850 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule "common"]
-	path = common
-	url = https://github.com/petermolnar/wp-common.git
 [submodule "wp-common"]
 	path = wp-common
 	url = git@github.com:petermolnar/wp-common.git
diff --git a/common b/common
deleted file mode 160000
index 8ddaed2..0000000
--- a/common
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 8ddaed268614d2826fb74d22033302c6df231ca3
diff --git a/wp-ffpc-class.php b/wp-ffpc-class.php
index 87e6683..1942c02 100644
--- a/wp-ffpc-class.php
+++ b/wp-ffpc-class.php
@@ -675,8 +675,7 @@ if ( ! class_exists( 'WP_FFPC' ) ) {
 		public function plugin_hook_options_migrate( &$options ) {
 			$migrated = false;
 
-			if ( $options['version'] != $this->plugin_version || !isset ( $options['version'] ) ) {
-
+			if ( version_compare ( $options['version'] , $this->plugin_version , '<' ) ) {
 				/* cleanup possible leftover files from previous versions */
 				$check = array ( 'advanced-cache.php', 'nginx-sample.conf', 'wp-ffpc.admin.css', 'wp-ffpc-common.php' );
 				foreach ( $check as $fname ) {