diff --git a/unpublishedScripts/hiddenEntityReset.js b/unpublishedScripts/hiddenEntityReset.js
index fde97beeb5..19a7a5ee5e 100644
--- a/unpublishedScripts/hiddenEntityReset.js
+++ b/unpublishedScripts/hiddenEntityReset.js
@@ -54,7 +54,6 @@
 
     MasterReset = function() {
         var resetKey = "resetMe";
-        var GRABBABLE_DATA_KEY = "grabbableKey";
 
         var HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/";
 
@@ -97,8 +96,6 @@
                 z: 505.78
             });
 
-
-
             createCombinedArmChair({
                 x: 549.29,
                 y: 494.9,
@@ -487,7 +484,6 @@
                     grabbableKey: {
                         invertSolidWhileHeld: true
                     }
-
                 })
             });
 
@@ -533,6 +529,9 @@
                         resetMe: true,
                         on: true,
                         type: "Hall Light"
+                    },
+                    grabbableKey: {
+                        wantsTrigger: true
                     }
                 })
             });
@@ -628,6 +627,9 @@
                         resetMe: true,
                         on: true,
                         type: "Garage Light"
+                    },
+                    grabbableKey: {
+                        wantsTrigger: true
                     }
                 })
             });
@@ -759,6 +761,7 @@
                     grabbableKey: {
                         invertSolidWhileHeld: true
                     }
+
                 })
             };
             var dice1 = Entities.addEntity(diceProps);
@@ -851,6 +854,7 @@
                     grabbableKey: {
                         invertSolidWhileHeld: true
                     }
+
                 })
             });
         }
@@ -1176,7 +1180,7 @@
                     y: 0.05,
                     z: 0.25
                 }
-            } ];
+            }];
 
             var modelURL, entity;
             for (i = 0; i < blockTypes.length; i++) {
diff --git a/unpublishedScripts/masterReset.js b/unpublishedScripts/masterReset.js
index 7316da57d1..54f29b4259 100644
--- a/unpublishedScripts/masterReset.js
+++ b/unpublishedScripts/masterReset.js
@@ -27,7 +27,6 @@ var targetsScriptURL = Script.resolvePath('../examples/toys/ping_pong_gun/wallTa
 
 MasterReset = function() {
     var resetKey = "resetMe";
-    var GRABBABLE_DATA_KEY = "grabbableKey";
 
     var HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/";
 
@@ -505,6 +504,9 @@ MasterReset = function() {
                     resetMe: true,
                     on: true,
                     type: "Hall Light"
+                },
+                grabbableKey: {
+                    wantsTrigger: true
                 }
             })
         });
@@ -600,6 +602,9 @@ MasterReset = function() {
                     resetMe: true,
                     on: true,
                     type: "Garage Light"
+                },
+                grabbableKey: {
+                    wantsTrigger: true
                 }
             })
         });