diff --git a/CRM/TwingleCampaign/Upgrader.php b/CRM/TwingleCampaign/Upgrader.php
index 54745e0..1be2733 100644
--- a/CRM/TwingleCampaign/Upgrader.php
+++ b/CRM/TwingleCampaign/Upgrader.php
@@ -66,18 +66,14 @@ class CRM_TwingleCampaign_Upgrader extends CRM_TwingleCampaign_Upgrader_Base {
           $custom_group['extends_entity_column_value'] = $campaign_type->getValue();
         }
       }
-      new Models\CustomGroup($custom_group);
-    }
-    foreach (Models\CustomGroup::getCustomGroups() as $custom_group) {
-      $custom_group->create();
+      $cg = new Models\CustomGroup($custom_group);
+      $cg->create();
     }
 
     // Create custom fields
     foreach ($campaign_info['custom_fields'] as $custom_field) {
-      new Models\CustomField($custom_field);
-    }
-    foreach (Models\CustomField::getCustomFields() as $custom_field) {
-      $custom_field->create();
+      $cf = new Models\CustomField($custom_field);
+      $cf->create();
     }
   }
 
diff --git a/CRM/TwingleCampaign/Upgrader/models/CustomField.php b/CRM/TwingleCampaign/Upgrader/models/CustomField.php
index 981efa9..e8af68e 100644
--- a/CRM/TwingleCampaign/Upgrader/models/CustomField.php
+++ b/CRM/TwingleCampaign/Upgrader/models/CustomField.php
@@ -7,7 +7,6 @@ use CRM_TwingleCampaign_ExtensionUtil as E;
 
 class CustomField {
 
-  private static $customFields = [];
   private $id;
   private $custom_group_id;
   private $label;
@@ -39,8 +38,6 @@ class CustomField {
         $this->help_post = E::ts($this->help_post);
       }
     }
-
-    array_push(self::$customFields, $this);
   }
 
   /**
@@ -312,13 +309,6 @@ class CustomField {
     $this->default_value = $default_value;
   }
 
-  /**
-   * @return array
-   */
-  public static function getCustomFields(): array {
-    return self::$customFields;
-  }
-
   /**
    * @return string
    */