diff --git a/src/js/services/configService.js b/src/js/services/configService.js
index 09dfe268f..3b2ef3826 100644
--- a/src/js/services/configService.js
+++ b/src/js/services/configService.js
@@ -179,18 +179,11 @@ angular.module('copayApp.services').factory('configService', function(storageSer
         if (!configCache.wallet.settings.unitCode) {
           configCache.wallet.settings.unitCode = defaultConfig.wallet.settings.unitCode;
         }
-        if (!configCache.glidera) {
-          configCache.glidera = defaultConfig.glidera;
-        }
-        if (!configCache.coinbaseV2) {
-          configCache.coinbaseV2 = defaultConfig.coinbaseV2;
-        }
-        if (!configCache.amazon) {
-          configCache.amazon = defaultConfig.amazon;
-        }
-        if (!configCache.bitpayCard) {
-          configCache.bitpayCard = defaultConfig.bitpayCard;
+
+        if (!configCache.hideNextSteps) {
+          configCache.hideNextSteps = defaultConfig.hideNextSteps;
         }
+
         if (!configCache.recentTransactions) {
           configCache.recentTransactions = defaultConfig.recentTransactions;
         }
diff --git a/www/views/includes/bitpayCardsCard.html b/www/views/includes/bitpayCardsCard.html
index 4f97fdc84..08cc56889 100644
--- a/www/views/includes/bitpayCardsCard.html
+++ b/www/views/includes/bitpayCardsCard.html
@@ -5,7 +5,7 @@
     <a ui-sref="tabs.bitpayCardIntro"><i class="icon ion-ios-plus-empty list-add-button"></i></a>
   </div>
   <div>
-    <a ng-repeat="card in bitpayCardItems"
+    <a ng-repeat="card in bitpayCardItems track by $index"
         ui-sref="tabs.bitpayCard({id:card.id})"
         class="item item-sub item-icon-left item-big-icon-left item-icon-right">
       <i class="icon big-icon-svg">
diff --git a/www/views/includes/homeIntegrations.html b/www/views/includes/homeIntegrations.html
index 06dae8ae7..34ae4702d 100644
--- a/www/views/includes/homeIntegrations.html
+++ b/www/views/includes/homeIntegrations.html
@@ -5,7 +5,7 @@
       <i class="icon bp-arrow-down" ng-show="hide"></i>
     </div>
     <div ng-show="!hide">
-      <div ng-repeat="service in services">
+      <div ng-repeat="service in services track by $index">
         <a ui-sref="{{service.sref}}" class="item item-sub item-icon-left item-big-icon-left item-icon-right next-step">
           <i class="icon big-icon-svg">
             <div class="bg {{service.icon}}"></div>
diff --git a/www/views/includes/nextSteps.html b/www/views/includes/nextSteps.html
index 6283cc818..caa6d1bf5 100644
--- a/www/views/includes/nextSteps.html
+++ b/www/views/includes/nextSteps.html
@@ -5,7 +5,7 @@
       <i class="icon bp-arrow-down" ng-show="hide"></i>
     </div>
     <div ng-show="!hide">
-      <div ng-repeat="service in services">
+      <div ng-repeat="service in services track by $index">
         <a ui-sref="{{service.sref}}" class="item item-sub item-icon-left item-big-icon-left item-icon-right next-step">
           <i class="icon big-icon-svg">
             <div class="bg {{service.icon}}"></div>
@@ -17,13 +17,3 @@
     </div>
   </div>
 
-      <!--  -->
-      <!-- <a ui&#45;sref="tabs.bitpayCardIntro" ng&#45;if="!externalServices.BitpayCard &#38;&#38; bitpayCardEnabled" class="item item&#45;sub item&#45;icon&#45;left item&#45;big&#45;icon&#45;left item&#45;icon&#45;right next&#45;step"> -->
-      <!--   <i class="icon big&#45;icon&#45;svg"> -->
-      <!--     <div class="bg icon&#45;bitpay&#45;card"></div> -->
-      <!--   </i> -->
-      <!--   <span translate>Add BitPay Visa&#38;reg; Card</span> -->
-      <!--   <i class="icon bp&#45;arrow&#45;right"></i> -->
-      <!-- </a> -->
-      <!-- </a> -->
-