diff --git a/.gitattributes b/.gitattributes
index 988ba8c..a21a6cb 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -159,14 +159,6 @@ changed_full/470-/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_univer
 changed_full/470-/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_create.tpl -text
 changed_full/470-/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_custom.tpl -text
 changed_full/470-/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_ecommerce.tpl -text
-changed_full/480-/modules/d3/d3_googleanalytics/views/blocks/layout/d3_base_googleanalytics.tpl -text
-changed_full/480-/modules/d3/d3_googleanalytics/views/tpl/widget/d3_googleanalytics.tpl -text
-changed_full/480-/modules/d3/d3_googleanalytics/views/tpl/widget/d3ga_universal.tpl -text
-changed_full/480-/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_campaigncode.tpl -text
-changed_full/480-/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_campaigns.tpl -text
-changed_full/480-/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_create.tpl -text
-changed_full/480-/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_custom.tpl -text
-changed_full/480-/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_ecommerce.tpl -text
 copy_this/.noencode -text
 copy_this/modules/d3/d3_googleanalytics/IntelliSenseHelper.php -text
 copy_this/modules/d3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalytics.php -text
diff --git a/changed_full/480-/modules/d3/d3_googleanalytics/views/blocks/layout/d3_base_googleanalytics.tpl b/changed_full/480-/modules/d3/d3_googleanalytics/views/blocks/layout/d3_base_googleanalytics.tpl
deleted file mode 100644
index fdef014..0000000
--- a/changed_full/480-/modules/d3/d3_googleanalytics/views/blocks/layout/d3_base_googleanalytics.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-[{$smarty.block.parent}]
-
-[{d3modcfgcheck modid="d3_googleanalytics"}]
-    [{include file=$sD3GATTpl}]
-[{/d3modcfgcheck}]
\ No newline at end of file
diff --git a/changed_full/480-/modules/d3/d3_googleanalytics/views/tpl/widget/d3_googleanalytics.tpl b/changed_full/480-/modules/d3/d3_googleanalytics/views/tpl/widget/d3_googleanalytics.tpl
deleted file mode 100644
index dcfa32a..0000000
--- a/changed_full/480-/modules/d3/d3_googleanalytics/views/tpl/widget/d3_googleanalytics.tpl
+++ /dev/null
@@ -1,196 +0,0 @@
-[{if $blD3GoogleAnalyticsActive && $oD3GASettings->getValue('sD3GAId')}]
-    [{if $oViewConf->getActiveClassName() == 'thankyou'}]
-        [{assign var="order" value=$oView->getOrder()}]
-        [{assign var="oPayment" value=$order->getPayment()}]
-        [{assign var="oDelSet" value=$order->getDelSet()}]
-        [{assign var="aVoucherSerieList" value=$order->d3getVoucherSerieList()}]
-        [{assign var="oUser" value=$oView->getUser()}]
-    [{/if}]
-
-    [{capture name="d3GATrackCode"}]
-            [{strip}]
-            <script type="text/javascript">
-                var _gaq = _gaq || [];
-                _gaq.push(['_setAccount', '[{ $oD3GASettings->getValue('sD3GAId') }]']);
-
-                [{if $oD3GASettings->getValue('blD3GAAnonymizeIP')}]
-                    _gaq.push(['_gat._anonymizeIp']);
-                [{/if}]
-
-                [{if $oD3GASettings->getValue('sD3GASetDomainName')}]
-                    _gaq.push(['_setDomainName', '[{$oD3GASettings->getValue('sD3GASetDomainName')}]']);
-                    _gaq.push(['_setAllowHash', false]);
-                [{else}]
-                    _gaq.push(['_setDomainName', 'none']);
-                [{/if}]
-
-                [{if $oD3GASettings->getValue('sD3GASetCookiePath')}]
-                    _gaq.push(['_setCookiePath', '[{$oD3GASettings->getValue('sD3GASetCookiePath')}]']);
-                [{/if}]
-
-                [{if $oD3GASettings->getValue('iD3GASiteSpeedSampleRate')}]
-                    _gaq.push(['_setSiteSpeedSampleRate', '[{$oD3GASettings->getValue('iD3GASiteSpeedSampleRate')}]']);
-                [{/if}]
-
-                [{if $oD3GASettings->getValue('blD3GAAllowDomainLinker')}]
-                    _gaq.push(['_setAllowLinker', true]);
-                [{/if}]
-
-                [{if $oD3GASettings->getValue('blD3GASetClientInfo')}]
-                    _gaq.push(['_setClientInfo', false]);
-                [{else}]
-                    _gaq.push(['_setClientInfo', true]);
-                [{/if}]
-
-                [{if $oD3GASettings->getValue('blD3GASetDetectFlash')}]
-                    _gaq.push(['_setDetectFlash', false]);
-                [{else}]
-                    _gaq.push(['_setDetectFlash', true]);
-                [{/if}]
-
-                [{if $oD3GASettings->getValue('blD3GASetDetectTitle')}]
-                    _gaq.push(['_setDetectTitle', false]);
-                [{else}]
-                    _gaq.push(['_setDetectTitle', true]);
-                [{/if}]
-
-                [{if !$oD3GASettings->getValue('blD3GASetCampaignTrack')}]
-                    _gaq.push(['_setCampaignTrack', true]);
-                [{else}]
-                    _gaq.push(['_setCampaignTrack', false]);
-                [{/if}]
-
-                [{if !$oD3GASettings->getValue('blD3GASetCampaignTrack') && $oD3GASettings->getValue('sD3GASetCampaignCookieTimeout')}]
-                    _gaq.push(['_setCampaignCookieTimeout', '[{$oD3GASettings->getValue('sD3GASetCampaignCookieTimeout')}]']);
-                [{/if}]
-
-                [{if !$oD3GASettings->getValue('blD3GASetCampaignTrack') && $oD3GASettings->getValue('sD3GASetCampNameKey')}]
-                    _gaq.push(['_setCampNameKey', '[{$oD3GASettings->getValue('sD3GASetCampNameKey')}]']);
-                [{/if}]
-
-                [{if !$oD3GASettings->getValue('blD3GASetCampaignTrack') && $oD3GASettings->getValue('sD3GASetCampMediumKey')}]
-                    _gaq.push(['_setCampMediumKey', '[{$oD3GASettings->getValue('sD3GASetCampMediumKey')}]']);
-                [{/if}]
-
-                [{if !$oD3GASettings->getValue('blD3GASetCampaignTrack') && $oD3GASettings->getValue('sD3GASetCampSourceKey')}]
-                    _gaq.push(['_setCampSourceKey', '[{$oD3GASettings->getValue('sD3GASetCampSourceKey')}]']);
-                [{/if}]
-
-                [{if !$oD3GASettings->getValue('blD3GASetCampaignTrack') && $oD3GASettings->getValue('sD3GASetCampTermKey')}]
-                    _gaq.push(['_setCampTermKey', '[{$oD3GASettings->getValue('sD3GASetCampTermKey')}]']);
-                [{/if}]
-
-                [{if !$oD3GASettings->getValue('blD3GASetCampaignTrack') && $oD3GASettings->getValue('sD3GASetCampContentKey')}]
-                    _gaq.push(['_setCampContentKey', '[{$oD3GASettings->getValue('sD3GASetCampContentKey')}]']);
-                [{/if}]
-
-                [{if !$oD3GASettings->getValue('blD3GASetCampaignTrack') && $oD3GASettings->getValue('sD3GASetCampContentKey')}]
-                    _gaq.push(['_setCampNOKey', 'ga_nooverride']);
-                [{/if}]
-
-                [{if $oD3GASettings->getValue('blD3GAUseCustomVars')}]
-    [{* /*** add custom variables here ***/ *}]
-                    [{if $oxcmp_user}]
-                        _gaq.push(['_setCustomVar',
-                            1,           [{*// This custom var is set to slot #1.  Required parameter.*}]
-                            'Geschlecht',    [{*// The name of the custom variable.  Required parameter.*}]
-                            [{if $oxcmp_user->oxuser__oxsal->value == 'MR'}]'male'[{elseif $oxcmp_user->oxuser__oxsal->value == 'MRS'}]'female'[{/if}],
-                                         [{*// The value of the custom variable.  Required parameter.*}]
-                            1            [{*// Sets the scope to visitor-level.  Optional parameter.*}]
-                        ]);
-                    [{/if}]
-                    [{if $oViewConf->getActiveClassName() == 'thankyou' && $oPayment}]
-                        _gaq.push(['_setCustomVar',2,'Zahlungsart', '[{$oPayment->getFieldData('oxdesc')}]' , 3]);
-                    [{/if}]
-                    [{if $oViewConf->getActiveClassName() == 'thankyou' && $oDelSet}]
-                        _gaq.push(['_setCustomVar',3,'Versandart', '[{$oDelSet->getFieldData('oxtitle')}]' , 3]);
-                    [{/if}]
-                    [{if $oViewConf->getActiveClassName() == 'thankyou' && $aVoucherSerieList}]
-                        [{foreach from=$aVoucherSerieList item="oVoucherSerie"}]
-                            _gaq.push(['_setCustomVar',4,'Gutschein', '[{$oVoucherSerie->getFieldData('oxserienr')}]', 3]);
-                        [{/foreach}]
-                    [{/if}]
-                    [{if $oViewConf->getActiveClassName() == 'thankyou' && $order}]
-                        _gaq.push(['_setCustomVar',5,'Waehrung', '[{$order->getFieldData('oxcurrency')}]' , 3]);
-                    [{/if}]
-                    [{if $oViewConf->getActiveClassName() == 'thankyou'}]
-                        _gaq.push(['_setCustomVar',5,'Neukunde', '[{$oView->isNewCustomer()}]',3]);
-                    [{/if}]
-                [{/if}]
-
-                _gaq.push(['_trackPageview' [{$sD3GASendPageViewParameter}]]);
-
-                [{if $oD3GASettings->getValue('blD3GATrackPageLoadTime')}]
-                    _gaq.push(['_trackPageLoadTime']);
-                [{/if}]
-
-                [{if $oD3GASettings->getValue('sD3GACookiePathCopy')}]
-                    _gaq.push(['_cookiePathCopy', '[{$oD3GASettings->getValue('sD3GACookiePathCopy')}]']);
-                [{/if}]
-
-                [{if $oD3GASettings->getValue('blD3GASendECommerce') && $oViewConf->getActiveClassName() == 'thankyou'}]
-
-                    [{assign var="currate" value=$order->oxorder__oxcurrate->value}]
-
-                    _gaq.push(['_addTrans',
-                        '[{ $order->oxorder__oxordernr->value }]',          [{* // order ID - required *}]
-                        '[{ $oxcmp_shop->oxshops__oxname->value}]',         [{* // affiliation or store name *}]
-                        [{if $oD3GASettings->getValue('blD3GAUseNetto') }]
-                             '[{math equation="s / r" s=$order->getOrderNetSum() r=$currate format="%.2f"}]',                [{* // total - required - has to be gross sum *}]
-                        [{else}]
-                            '[{math equation="s / r" s=$order->getTotalOrderSum() r=$currate format="%.2f"}]',             [{* // total - required *}]
-                        [{/if}]
-                        '[{math equation="s - r" s=$order->getTotalOrderSum() r=$order->getOrderNetSum() format="%.2f"}]', [{* // tax *}]
-                        '[{math equation="s / r" s=$order->oxorder__oxdelcost->value r=$currate format="%.2f"}]',          [{* // shipping *}]
-                        '[{ $order->oxorder__oxbillcity->value }]',         [{* // city *}]
-                        '[{ $order->oxorder__oxbillstate->value }]',        [{* // state or province *}]
-                        '[{ $order->oxorder__oxbillcountry->value }]'       [{* // country *}]
-                    ]);
-
-                    [{foreach from=$order->getOrderArticles() item=oOrderArticle}]
-                        _gaq.push(['_addItem',
-                            '[{ $order->oxorder__oxordernr->value }]',                      [{* // order ID - required *}]
-                            '[{ $oOrderArticle->oxorderarticles__oxartnum->value }]',       [{* // SKU/code *}]
-                            '[{ $oOrderArticle->oxorderarticles__oxtitle->value }]',        [{* // product name *}]
-                            '[{ $oOrderArticle->oxorderarticles__oxselvariant->value }]',   [{* // category or variation *}]
-                            [{if $oD3GASettings->getValue('blD3GAUseNetto') }]
-                                [{assign var="oPrice" value=$oOrderArticle->getPrice()}]
-                                '[{math equation="s / r" s=$oPrice->getNettoPrice() r=$currate format="%.2f"}]',                           [{* // unit price - required *}]
-                            [{else}]
-                                '[{ $oOrderArticle->oxorderarticles__oxprice->value }]',    [{* // unit price - required - is not currency depended *}]
-                            [{/if}]
-                            '[{ $oOrderArticle->oxorderarticles__oxamount->value }]'        [{* // quantity - required *}]
-                        ]);
-                    [{/foreach}]
-
-                    _gaq.push(['_trackTrans']);
-
-                [{/if}]
-
-                (function() {
-                    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-
-                    [{if $oD3GASettings->getValue('blD3GAUseRemarketing')}]
-                        ga.src = ('https:' == document.location.protocol ? 'https://' : 'http://') + 'stats.g.doubleclick.net/dc.js';
-                    [{else}]
-                        ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-                    [{/if}]
-
-                    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-                })();
-            </script>
-
-            [{if (!$oD3GASettings->getValue('blD3GASetCampaignOnThankyouOnly') || $oViewConf->getActiveClassName() == 'thankyou') &&
-                  !$oD3GASettings->getValue('blD3GASetCampaignTrack') && $oD3GASettings->getValue('sD3GACampaignCode')}]
-                [{$oD3GASettings->getValue('sD3GACampaignCode')}]
-            [{/if}]
-        [{/strip}]
-    [{/capture}]
-
-    [{if $oViewConf->getActiveClassName() == 'thankyou'}]
-        [{$oView->logCode($smarty.capture.d3GATrackCode)}]
-    [{/if}]
-
-    [{$smarty.capture.d3GATrackCode}]
-
-[{/if}]
\ No newline at end of file
diff --git a/changed_full/480-/modules/d3/d3_googleanalytics/views/tpl/widget/d3ga_universal.tpl b/changed_full/480-/modules/d3/d3_googleanalytics/views/tpl/widget/d3ga_universal.tpl
deleted file mode 100644
index 68ad0bb..0000000
--- a/changed_full/480-/modules/d3/d3_googleanalytics/views/tpl/widget/d3ga_universal.tpl
+++ /dev/null
@@ -1,66 +0,0 @@
-[{if $blD3GoogleAnalyticsActive && $oD3GASettings->getValue('sD3GAId')}]
-    [{capture name="d3GATrackCode"}]
-        [{strip}]
-            <script type="text/javascript">
-                (function(i,s,o,g,r,a,m){
-                    i['GoogleAnalyticsObject']=r;
-                    i[r]=i[r]||function(){
-                        (i[r].q=i[r].q||[]).push(arguments)
-                    },
-                    i[r].l=1*new Date();
-                    a=s.createElement(o),
-                    m=s.getElementsByTagName(o)[0];
-                    a.async=1;
-                    a.src=g;
-                    m.parentNode.insertBefore(a,m)
-                })(
-                    window,document,'script','//www.google-analytics.com/analytics.js','d3ga'
-                );
-
-                d3ga('create', '[{$oD3GASettings->getValue('sD3GAId')}]', '[{$sD3CurrentShopUrl}]' [{$sD3GACreateParameter}]);
-
-                [{if $oD3GASettings->getValue('blD3GAAnonymizeIP')}]
-                    d3ga('set', 'anonymizeIp', true);
-                [{/if}]
-
-                [{include file="d3ga_universal_campaigns.tpl"}]
-
-                [{include file="d3ga_universal_custom.tpl"}]
-
-                [{if $oD3GASettings->getValue('blD3GAUseRemarketing')}]
-                    d3ga('require', 'displayfeatures');
-                [{/if}]
-
-                d3ga('send', 'pageview' [{$sD3GASendPageViewParameter}]);
-
-                [{if $oD3GASettings->getValue('blD3GATrackPageLoadTime')}]
-                    var perfData = window.performance.timing;
-                    var pageLoadTime = perfData.domComplete - perfData.navigationStart;
-                    var loadTime = "";
-
-                    if (pageLoadTime < 1000) { loadTime = "0-1 seconds"; }
-                    else if (pageLoadTime < 2000) { loadTime = "1-2 seconds"; }
-                    else if (pageLoadTime < 3000) { loadTime = "2-3 seconds"; }
-                    else if (pageLoadTime < 4000) { loadTime = "3-4 seconds"; }
-                    else if (pageLoadTime < 5000) { loadTime = "4-5 seconds"; }
-                    else if (pageLoadTime < 6000) { loadTime = "5-6 seconds"; }
-                    else if (pageLoadTime < 10000) { loadTime = "6-10 seconds"; }
-                    else { loadTime = "10+ seconds"; }
-
-                    d3ga('send', 'event', 'Page Load Time', loadTime, {'nonInteraction': 1});
-                [{/if}]
-
-                [{include file="d3ga_universal_ecommerce.tpl"}]
-            </script>
-
-            [{include file="d3ga_universal_campaigncode.tpl"}]
-
-        [{/strip}]
-    [{/capture}]
-
-    [{if $oViewConf->getActiveClassName() == 'thankyou'}]
-        [{$oView->logCode($smarty.capture.d3GATrackCode)}]
-    [{/if}]
-
-    [{$smarty.capture.d3GATrackCode}]
-[{/if}]
\ No newline at end of file
diff --git a/changed_full/480-/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_campaigncode.tpl b/changed_full/480-/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_campaigncode.tpl
deleted file mode 100644
index daf8446..0000000
--- a/changed_full/480-/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_campaigncode.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-[{if (!$oD3GASettings->getValue('blD3GASetCampaignOnThankyouOnly') || $oViewConf->getActiveClassName() == 'thankyou') &&
-!$oD3GASettings->getValue('blD3GASetCampaignTrack') && $oD3GASettings->getValue('sD3GACampaignCode')}]
-    [{$oD3GASettings->getValue('sD3GACampaignCode')}]
-[{/if}]
\ No newline at end of file
diff --git a/changed_full/480-/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_campaigns.tpl b/changed_full/480-/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_campaigns.tpl
deleted file mode 100644
index e71bb78..0000000
--- a/changed_full/480-/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_campaigns.tpl
+++ /dev/null
@@ -1,25 +0,0 @@
-[{strip}]
-    [{if !$oD3GASettings->getValue('blD3GASetCampaignTrack') && $oD3GASettings->getValue('sD3GASetCampNameKey')}]
-        ga('set', 'campaignName', '[{$oD3GASettings->getValue('sD3GASetCampNameKey')}]');
-    [{/if}]
-
-    [{if !$oD3GASettings->getValue('blD3GASetCampaignTrack') && $oD3GASettings->getValue('sD3GASetCampMediumKey')}]
-        ga('set', 'campaignMedium', '[{$oD3GASettings->getValue('sD3GASetCampMediumKey')}]');
-    [{/if}]
-
-    [{if !$oD3GASettings->getValue('blD3GASetCampaignTrack') && $oD3GASettings->getValue('sD3GASetCampSourceKey')}]
-        ga('set', 'campaignSource', '[{$oD3GASettings->getValue('sD3GASetCampSourceKey')}]');
-    [{/if}]
-
-    [{if !$oD3GASettings->getValue('blD3GASetCampaignTrack') && $oD3GASettings->getValue('sD3GASetCampTermKey')}]
-        ga('set', 'campaignKeyword', '[{$oD3GASettings->getValue('sD3GASetCampTermKey')}]');
-    [{/if}]
-
-    [{if !$oD3GASettings->getValue('blD3GASetCampaignTrack') && $oD3GASettings->getValue('sD3GASetCampContentKey')}]
-        ga('set', 'campaignContent', '[{$oD3GASettings->getValue('sD3GASetCampContentKey')}]');
-    [{/if}]
-
-    [{if !$oD3GASettings->getValue('blD3GASetCampaignTrack') && $oD3GASettings->getValue('sD3GASetCampIdKey')}]
-        ga('set', 'campaignId', '[{$oD3GASettings->getValue('sD3GASetCampIdKey')}]');
-    [{/if}]
-[{/strip}]
\ No newline at end of file
diff --git a/changed_full/480-/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_create.tpl b/changed_full/480-/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_create.tpl
deleted file mode 100644
index 06c9881..0000000
--- a/changed_full/480-/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_create.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-[{if $oD3GASettings->getValue('sD3GASetDomainName')}]
-    [{capture name="d3GACreate"}]
-        [{$smarty.capture.d3GACreate}]
-        'cookieDomain': '[{$oD3GASettings->getValue('sD3GASetDomainName')}]',
-    [{/capture}]
-[{/if}]
-
-$aParameter[] = "'legacyCookieDomain': '".d3_cfg_mod::get($this->_sModId)->getValue('sD3GASetDomainName')."'";
-}
-if (d3_cfg_mod::get($this->_sModId)->getValue('sD3GASetCookiePath')) {
-$aParameter[] = "'cookiePath': '".d3_cfg_mod::get($this->_sModId)->getValue('sD3GASetCookiePath')."'";
-}
-if (d3_cfg_mod::get($this->_sModId)->getValue('blD3GAAllowDomainLinker')) {
-$aParameter[] = "'allowLinker': true";
-}
-
-if (count($aParameter)) {
-return ", {".implode(',', $aParameter)."}";
-}
-
-return '';
\ No newline at end of file
diff --git a/changed_full/480-/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_custom.tpl b/changed_full/480-/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_custom.tpl
deleted file mode 100644
index 9275d81..0000000
--- a/changed_full/480-/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_custom.tpl
+++ /dev/null
@@ -1,65 +0,0 @@
-[{if $oD3GASettings->getValue('blD3GAUseCustomVars')}]
-[{strip}]
-    [{if $oViewConf->getActiveClassName() == 'thankyou'}]
-        [{assign var="order" value=$oView->getOrder()}]
-        [{assign var="oPayment" value=$order->getPayment()}]
-        [{assign var="oDelSet" value=$order->getDelSet()}]
-        [{assign var="aVoucherSerieList" value=$order->d3getVoucherSerieList()}]
-    [{/if}]
-
-    [{* dimension 1 set customer gender *}]
-    [{if $oxcmp_user}]
-        d3ga(
-            'set',
-            'dimension1',
-            '[{if $oxcmp_user->oxuser__oxsal->value == 'MR'}]male[{elseif $oxcmp_user->oxuser__oxsal->value == 'MRS'}]female[{/if}]'
-        );
-    [{/if}]
-
-    [{* dimension 2 set payment type *}]
-    [{if $oViewConf->getActiveClassName() == 'thankyou' && $oPayment}]
-        d3ga(
-            'set',
-            'dimension2',
-            '[{$oPayment->getFieldData('oxdesc')}]'
-        );
-    [{/if}]
-
-    [{* dimension 3 set delivery type *}]
-    [{if $oViewConf->getActiveClassName() == 'thankyou' && $oDelSet}]
-        d3ga(
-            'set',
-            'dimension3',
-            '[{$oDelSet->getFieldData('oxtitle')}]'
-        );
-    [{/if}]
-
-    [{* dimension 4 set vouchers *}]
-    [{if $oViewConf->getActiveClassName() == 'thankyou' && $aVoucherSerieList}]
-        d3ga(
-            'set', {
-                [{foreach from=$aVoucherSerieList item="oVoucherSerie"}]
-                    'dimension4' :  '[{$oVoucherSerie->getFieldData('oxserienr')}]',
-                [{/foreach}]
-            }
-        );
-    [{/if}]
-
-    [{* dimension 5 set currency *}]
-    [{if $oViewConf->getActiveClassName() == 'thankyou' && $order}]
-        d3ga(
-            'set',
-            'dimension5',
-            '[{$order->getFieldData('oxcurrency')}]'
-        );
-    [{/if}]
-
-    [{* dimension 6 set new customer status *}]
-    [{if $oViewConf->getActiveClassName() == 'thankyou'}]
-        d3ga(
-            'set',
-            'dimension6',
-            '[{$oView->isNewCustomer()}]'
-        );
-    [{/if}]
-[{/strip}][{/if}]
\ No newline at end of file
diff --git a/changed_full/480-/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_ecommerce.tpl b/changed_full/480-/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_ecommerce.tpl
deleted file mode 100644
index bda0d2c..0000000
--- a/changed_full/480-/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_ecommerce.tpl
+++ /dev/null
@@ -1,46 +0,0 @@
-[{if $oD3GASettings->getValue('blD3GASendECommerce') && $oViewConf->getActiveClassName() == 'thankyou'}]
-[{strip}]
-    [{if $oViewConf->getActiveClassName() == 'thankyou'}]
-        [{assign var="order" value=$oView->getOrder()}]
-    [{/if}]
-
-    d3ga('require', 'ecommerce', 'ecommerce.js');
-
-    [{assign var="currate" value=$order->oxorder__oxcurrate->value}]
-    [{if $oD3GASettings->getValue('blD3GAUseNetto')}]
-        [{math equation="s / r" s=$order->getOrderNetSum() r=$currate format="%.2f" assign="sTotal"}]   [{* // total - required - has to be gross sum *}]
-    [{else}]
-        [{math equation="s / r" s=$order->getTotalOrderSum() r=$currate format="%.2f" assign="sTotal"}] [{* // total - required *}]
-    [{/if}]
-    [{math equation="s - r" s=$order->getTotalOrderSum() r=$order->getOrderNetSum() format="%.2f" assign="sTax"}]
-    [{math equation="s / r" s=$order->oxorder__oxdelcost->value r=$currate format="%.2f" assign="sShipping"}]
-
-    d3ga('ecommerce:addTransaction', {
-    'id':           '[{$order->oxorder__oxordernr->value}]',        [{* Transaction ID. Required *}]
-    'affiliation':  '[{$oxcmp_shop->oxshops__oxname->value}]',      [{* Affiliation or store name *}]
-    'revenue':      '[{$sTotal}]',                                  [{* Gesamtwert *}]
-    'shipping':     '[{$sShipping}]',                               [{* Versand *}]
-    'tax':          '[{$sTax}]'                                     [{* Steuer *}]
-    });
-
-    [{foreach from=$order->getOrderArticles() item=oOrderArticle}]
-
-        [{if $oD3GASettings->getValue('blD3GAUseNetto')}]
-            [{assign var="oPrice" value=$oOrderArticle->getPrice()}]
-            [{math equation="s / r" s=$oPrice->getNettoPrice() r=$currate format="%.2f" assign="sPrice"}]
-        [{else}]
-            [{assign var="sPrice" value=$oOrderArticle->oxorderarticles__oxprice->value}]
-        [{/if}]
-
-        d3ga('ecommerce:addItem', {
-        'id': '[{$order->oxorder__oxordernr->value}]',                          [{* Transaktions-ID *}]
-        'name': '[{$oOrderArticle->oxorderarticles__oxtitle->value}]',          [{* Produktname *}]
-        'sku': '[{$oOrderArticle->oxorderarticles__oxartnum->value}]',          [{* SKU/Code *}]
-        'category': '[{$oOrderArticle->oxorderarticles__oxselvariant->value}]', [{* Kategorie oder Ausführung *}]
-        'price': '[{$sPrice}]',                                                 [{* Preis pro Einheit *}]
-        'quantity': '[{$oOrderArticle->oxorderarticles__oxamount->value}]'      [{* Menge *}]
-        });
-    [{/foreach}]
-
-    d3ga('ecommerce:send');
-[{/strip}][{/if}]
\ No newline at end of file