diff --git a/unpublishedScripts/DomainContent/Home/growingPlant/waterCanEntityScript.js b/unpublishedScripts/DomainContent/Home/growingPlant/waterCanEntityScript.js
index 44904a0173..21497c2706 100644
--- a/unpublishedScripts/DomainContent/Home/growingPlant/waterCanEntityScript.js
+++ b/unpublishedScripts/DomainContent/Home/growingPlant/waterCanEntityScript.js
@@ -37,6 +37,14 @@
         },
 
         startHold: function() {
+            if (_this.waterSpout) {
+                _this.waterSpoutPosition = Entities.getEntityProperties(_this.waterSpout, "position").position;
+                _this.waterSpoutRotation = Entities.getEntityProperties(_this.waterSpout, "rotation").rotation;
+                _this.createWaterEffect();
+            } else {
+                print("EBL NO WATER SPOUT FOUND RETURNING");
+                return;
+            }
             _this.findGrowableEntities();
         },
 
@@ -50,6 +58,9 @@
 
         releaseHold: function() {
             _this.stopPouring();
+            Script.setTimeout(function() {
+               Entities.deleteEntity(_this.waterEffect);
+            }, 2000);
         },
 
         stopPouring: function() {
@@ -130,8 +141,6 @@
 
         },
 
-
-
         createWaterEffect: function() {
             var waterEffectPosition = Vec3.sum(_this.waterSpoutPosition, Vec3.multiply(Quat.getFront(_this.waterSpoutRotation), -0.04));
             _this.waterEffect = Entities.addEntity({
@@ -157,6 +166,7 @@
                 },
                 maxParticles: 20000,
                 lifespan: 2,
+                lifetime: 5000, //Doubtful anyone will hold water can longer than this
                 emitRate: 2000,
                 emitSpeed: .3,
                 speedSpread: 0.1,
@@ -222,13 +232,7 @@
                     }
                 });
 
-                if (_this.waterSpout) {
-                    _this.waterSpoutPosition = Entities.getEntityProperties(_this.waterSpout, "position").position;
-                    _this.waterSpoutRotation = Entities.getEntityProperties(_this.waterSpout, "rotation").rotation;
-                    _this.createWaterEffect();
-                }
-
-            }, 3000);
+            }, 2000);
 
         },
 
diff --git a/unpublishedScripts/DomainContent/Home/growingPlant/wrapper.js b/unpublishedScripts/DomainContent/Home/growingPlant/wrapper.js
index ef61270b53..f1679d8b8d 100644
--- a/unpublishedScripts/DomainContent/Home/growingPlant/wrapper.js
+++ b/unpublishedScripts/DomainContent/Home/growingPlant/wrapper.js
@@ -127,13 +127,6 @@ Plant = function(spawnPosition, spawnRotation) {
 
   var waterSpoutPosition = Vec3.sum(waterCanPosition, Vec3.multiply(0.2, Quat.getFront(orientation)))
   var waterSpoutRotation = Quat.multiply(waterCanRotation, Quat.fromPitchYawRollDegrees(10, 0, 0));
-  // var waterSpoutRotation = {
-  //     x: waterSpoutRotation.x,
-  //     y: waterSpoutRotation.y,
-  //     z: waterSpoutRotation.z,
-  //     w: waterSpoutRotation.w
-  //   };
-  print("EBL SET ROTATION")
   var waterSpout = Entities.addEntity({
     type: "Box",
     name: "hifi-water-spout",
@@ -150,7 +143,7 @@ Plant = function(spawnPosition, spawnRotation) {
     position: waterSpoutPosition,
     rotation: waterSpoutRotation,
     parentID: waterCan,
-    // visible: false,
+    visible: false,
     userData: JSON.stringify({
       'hifiHomeKey': {
         'reset': true