diff --git a/CRM/TwingleCampaign/BAO/Campaign.php b/CRM/TwingleCampaign/BAO/Campaign.php
index aa09a28..b2a2f0c 100644
--- a/CRM/TwingleCampaign/BAO/Campaign.php
+++ b/CRM/TwingleCampaign/BAO/Campaign.php
@@ -56,7 +56,7 @@ abstract class CRM_TwingleCampaign_BAO_Campaign {
       $this->translateCustomFields($campaign, self::OUT);
 
       // Translate keys and values
-      self::formatValues($campaign, self::OUT);
+      //self::formatValues($campaign, self::OUT);
       self::translateKeys($campaign, self::OUT);
 
     }
@@ -171,7 +171,6 @@ abstract class CRM_TwingleCampaign_BAO_Campaign {
           $result['values'],
           self::CIVICRM
         );
-        break;
       case $twingle_campaign_type_values['twingle_event']:
         return new TwingleEvent(
           $result['values'],
@@ -182,7 +181,6 @@ abstract class CRM_TwingleCampaign_BAO_Campaign {
           $result['values'],
           self::CIVICRM
         );
-        break;
       default:
         return NULL;
     }
diff --git a/CRM/TwingleCampaign/BAO/TwingleEvent.php b/CRM/TwingleCampaign/BAO/TwingleEvent.php
index 4877c94..6095799 100644
--- a/CRM/TwingleCampaign/BAO/TwingleEvent.php
+++ b/CRM/TwingleCampaign/BAO/TwingleEvent.php
@@ -88,7 +88,7 @@ class CRM_TwingleCampaign_BAO_TwingleEvent extends Campaign {
 
         // ... if not, get embed data and create event
         try {
-          $result = $event->create($user, $is_test);
+          $result = $event->create($is_test);
         } catch (Exception $e) {
           $errorMessage = $e->getMessage();
 
@@ -149,7 +149,6 @@ class CRM_TwingleCampaign_BAO_TwingleEvent extends Campaign {
   /**
    * Create the Event as a campaign in CiviCRM if it does not exist
    *
-   * @param int $user
    * @param bool $is_test
    * If true: don't do any changes
    *
@@ -158,7 +157,7 @@ class CRM_TwingleCampaign_BAO_TwingleEvent extends Campaign {
    *
    * @throws \CiviCRM_API3_Exception
    */
-  public function create(int $user, bool $is_test = FALSE) {
+  public function create(bool $is_test = FALSE) {
 
     // Create campaign only if it does not already exist
     if (!$is_test) {
@@ -203,7 +202,6 @@ class CRM_TwingleCampaign_BAO_TwingleEvent extends Campaign {
       ) {
         $result = civicrm_api3('Case', 'create', [
           'contact_id' => $formattedValues['contact_id'],
-          'creator_id' => $user,
           'case_type_id' => Configuration::get('twinglecampaign_start_case'),
           'subject' => $formattedValues['title'],
           'start_date' => $formattedValues['created_at'],
diff --git a/CRM/TwingleCampaign/Upgrader.php b/CRM/TwingleCampaign/Upgrader.php
index 2bfc993..6651460 100644
--- a/CRM/TwingleCampaign/Upgrader.php
+++ b/CRM/TwingleCampaign/Upgrader.php
@@ -22,7 +22,7 @@ class CRM_TwingleCampaign_Upgrader extends CRM_TwingleCampaign_Upgrader_Base {
     // Create campaign types, custom fields and custom groups by the contents
     // of the json file "campaigns.json"
 
-    $campaign_info = ExtensionCache::getInstance()->getCampaigns();
+    $campaign_info = Cache::getInstance()->getCampaigns();
 
     // Create campaign types
     foreach ($campaign_info['campaign_types'] as $campaign_type) {
@@ -56,7 +56,7 @@ class CRM_TwingleCampaign_Upgrader extends CRM_TwingleCampaign_Upgrader_Base {
    */
   public function uninstall() {
 
-    $campaign_info = ExtensionCache::getInstance()->getCampaigns();
+    $campaign_info = Cache::getInstance()->getCampaigns();
 
     // Delete campaign types
     foreach ($campaign_info['campaign_types'] as $campaign_type) {