diff --git a/includes/migrate/7000/og_add_fields.inc b/includes/migrate/7000/og_add_fields.inc
index d9ba042..53b84c9 100644
--- a/includes/migrate/7000/og_add_fields.inc
+++ b/includes/migrate/7000/og_add_fields.inc
@@ -5,8 +5,6 @@
  * Add OG related fields to group and group-content node-types.
  */
 
-if (db_table_exists('d6_og')) {
-
 class OgMigrateAddFields extends MigrationBase {
 
   public function __construct() {
@@ -92,5 +90,3 @@ class OgMigrateAddFields extends MigrationBase {
     return MigrationBase::RESULT_COMPLETED;
   }
 }
-
-}
diff --git a/includes/migrate/7000/og_content.inc b/includes/migrate/7000/og_content.inc
index cb463e3..ef837bf 100644
--- a/includes/migrate/7000/og_content.inc
+++ b/includes/migrate/7000/og_content.inc
@@ -6,8 +6,6 @@
  * value.
  */
 
-if (db_table_exists('d6_og')) {
-
 class OgMigrateContent extends Migration {
 
   public function __construct() {
@@ -58,5 +56,3 @@ class OgMigrateContent extends Migration {
     $this->addFieldMapping('etid', 'nid');
   }
 }
-
-}
diff --git a/includes/migrate/7000/og_group.inc b/includes/migrate/7000/og_group.inc
index 9d17ecf..0af03c1 100644
--- a/includes/migrate/7000/og_group.inc
+++ b/includes/migrate/7000/og_group.inc
@@ -5,8 +5,6 @@
  * Upgrade nodes that are groups, by settings the correct field value.
  */
 
-if (db_table_exists('d6_og')) {
-
 class OgMigrateGroup extends DynamicMigration {
 
   /**
@@ -54,5 +52,3 @@ class OgMigrateGroup extends DynamicMigration {
     return drupal_strtolower('OgMigrateGroup' . ucfirst($this->arguments['bundle']));
   }
 }
-
-}
diff --git a/includes/migrate/7000/og_user.inc b/includes/migrate/7000/og_user.inc
index 0755f46..19e02d6 100644
--- a/includes/migrate/7000/og_user.inc
+++ b/includes/migrate/7000/og_user.inc
@@ -5,8 +5,6 @@
  * Create user relation to group.
  */
 
-if (db_table_exists('d6_og')) {
-
 class OgMigrateUser extends Migration {
 
   public function __construct() {
@@ -64,5 +62,3 @@ class OgMigrateUser extends Migration {
     parent::prepareRow($row);
   }
 }
-
-}
diff --git a/includes/migrate/7200/og_og_membership.migrate.inc b/includes/migrate/7200/og_og_membership.migrate.inc
index d60e31d..b940d43 100644
--- a/includes/migrate/7200/og_og_membership.migrate.inc
+++ b/includes/migrate/7200/og_og_membership.migrate.inc
@@ -8,8 +8,6 @@
  * to branch 7.x-2.x
  */
 
-if (db_field_exists('og_membership', 'group_type') && db_table_exists('og') && !db_table_exists('d6_og')) {
-
 class OgMigrateMembership extends OgEntityMigration {
 
   /**
@@ -100,5 +98,3 @@ class OgMigrateMembership extends OgEntityMigration {
       ->execute();
   }
 }
-
-}
diff --git a/includes/migrate/7200/og_roles.migrate.inc b/includes/migrate/7200/og_roles.migrate.inc
index cdc40b1..7a08e5f 100644
--- a/includes/migrate/7200/og_roles.migrate.inc
+++ b/includes/migrate/7200/og_roles.migrate.inc
@@ -9,8 +9,6 @@
  */
 
 
-if (db_field_exists('og_membership', 'group_type') && db_table_exists('og') && !db_table_exists('d6_og')) {
-
 class OgMigrateRoles extends OgEntityMigration {
 
   public $tableName = 'og_role';
@@ -106,5 +104,3 @@ class OgMigrateRoles extends OgEntityMigration {
     $entity->group_bundle = $bundle;
   }
 }
-
-}
\ No newline at end of file
diff --git a/includes/migrate/7200/og_user_roles.migrate.inc b/includes/migrate/7200/og_user_roles.migrate.inc
index 067bc9a..44e40f6 100644
--- a/includes/migrate/7200/og_user_roles.migrate.inc
+++ b/includes/migrate/7200/og_user_roles.migrate.inc
@@ -8,8 +8,6 @@
  * to branch 7.x-2.x
  */
 
-if (db_field_exists('og_membership', 'group_type') && db_table_exists('og') && !db_table_exists('d6_og')) {
-
 class OgMigrateUserRoles extends OgEntityMigration {
 
   public $tableName = 'og_users_roles';
@@ -108,5 +106,3 @@ class OgMigrateUserRoles extends OgEntityMigration {
     }
   }
 }
-
-}
diff --git a/og_ui/includes/migrate/7000/add_field.inc b/og_ui/includes/migrate/7000/add_field.inc
index a11f6db..a50b331 100644
--- a/og_ui/includes/migrate/7000/add_field.inc
+++ b/og_ui/includes/migrate/7000/add_field.inc
@@ -5,8 +5,6 @@
  * Add OG UI related fields to group node-types.
  */
 
-if (db_table_exists('d6_og')) {
-
 class OgUiMigrateAddField extends MigrationBase {
 
   public function __construct() {
@@ -45,5 +43,3 @@ class OgUiMigrateAddField extends MigrationBase {
     return MigrationBase::RESULT_COMPLETED;
   }
 }
-
-}
diff --git a/og_ui/includes/migrate/7000/populate_field.inc b/og_ui/includes/migrate/7000/populate_field.inc
index 6b75155..13ed128 100644
--- a/og_ui/includes/migrate/7000/populate_field.inc
+++ b/og_ui/includes/migrate/7000/populate_field.inc
@@ -5,8 +5,6 @@
  * Upgrade group visibility (e.g. open, moderated, closed) from OG6.
  */
 
-if (db_table_exists('d6_og')) {
-
 class OgUiPopulateField extends DynamicMigration {
 
   /**
@@ -53,6 +51,3 @@ class OgUiPopulateField extends DynamicMigration {
     return drupal_strtolower('OgUiPopulateField' . ucfirst($this->arguments['bundle']));
   }
 }
-
-}
-
diff --git a/og_ui/includes/migrate/7000/set_roles.inc b/og_ui/includes/migrate/7000/set_roles.inc
index 3f8bb01..6423fb8 100644
--- a/og_ui/includes/migrate/7000/set_roles.inc
+++ b/og_ui/includes/migrate/7000/set_roles.inc
@@ -5,8 +5,6 @@
  * Set permissions on group to upgrade group visibility.
  */
 
-if (db_table_exists('d6_og')) {
-
 class OgUiSetRoles extends Migration {
 
   /**
@@ -102,6 +100,3 @@ class OgUiSetRoles extends Migration {
     return TRUE;
   }
 }
-
-}
-
diff --git a/og_ui/og_ui.module b/og_ui/og_ui.module
index 677ecb6..7a9de65 100644
--- a/og_ui/og_ui.module
+++ b/og_ui/og_ui.module
@@ -1122,6 +1122,7 @@ function og_ui_migrate_api() {
   $migrations = array();
   if (db_table_exists('d6_og')) {
     $migrations['OgUiMigrateAddField'] = array('class_name' => 'OgUiMigrateAddField');
+    $migrations['OgUiPopulateField'] = array('class_name' => 'OgUiPopulateField');
     $migrations['OgUiSetRoles'] = array('class_name' => 'OgUiSetRoles');
   }
   $api = array(