From b080dd8c642c7902b59f15af796d24b7717d1959 Mon Sep 17 00:00:00 2001
From: "James B. Pollack" <jamesbradenpollack@gmail.com>
Date: Thu, 17 Mar 2016 09:42:17 -0700
Subject: [PATCH] cleanup

---
 .../growingPlant/growingPlantEntityScript.js     |  4 ++--
 .../Home/pingPongGun/pingPongGun.js              |  2 +-
 unpublishedScripts/DomainContent/Home/reset.js   | 16 +++++++++++-----
 .../DomainContent/Home/tiltMaze/maze.js          |  2 +-
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/unpublishedScripts/DomainContent/Home/growingPlant/growingPlantEntityScript.js b/unpublishedScripts/DomainContent/Home/growingPlant/growingPlantEntityScript.js
index e32720b23c..4a7eca1cab 100644
--- a/unpublishedScripts/DomainContent/Home/growingPlant/growingPlantEntityScript.js
+++ b/unpublishedScripts/DomainContent/Home/growingPlant/growingPlantEntityScript.js
@@ -9,10 +9,10 @@
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 
-
+Script.include('utils.js');
 
 (function() {
-    Script.include('../../../../libraries/utils.js');
+    
 
     var _this;
 
diff --git a/unpublishedScripts/DomainContent/Home/pingPongGun/pingPongGun.js b/unpublishedScripts/DomainContent/Home/pingPongGun/pingPongGun.js
index c77671d478..24edbe8522 100644
--- a/unpublishedScripts/DomainContent/Home/pingPongGun/pingPongGun.js
+++ b/unpublishedScripts/DomainContent/Home/pingPongGun/pingPongGun.js
@@ -11,7 +11,7 @@
 /*global print, MyAvatar, Entities, AnimationCache, SoundCache, Scene, Camera, Overlays, Audio, HMD, AvatarList, AvatarManager, Controller, UndoStack, Window, Account, GlobalServices, Script, ScriptDiscoveryService, LODManager, Menu, Vec3, Quat, AudioDevice, Paths, Clipboard, Settings, XMLHttpRequest, randFloat, randInt */
 (function() {
 
-    Script.include("../utils.js");
+    Script.include("utils.js");
 
     var SHOOTING_SOUND_URL = 'http://hifi-public.s3.amazonaws.com/sounds/ping_pong_gun/pong_sound.wav';
     var PING_PONG_BALL_URL = 'http://hifi-public.s3.amazonaws.com/models/ping_pong_gun/ping_pong_ball.fbx';
diff --git a/unpublishedScripts/DomainContent/Home/reset.js b/unpublishedScripts/DomainContent/Home/reset.js
index a43ebe3e3e..5f770a2ca9 100644
--- a/unpublishedScripts/DomainContent/Home/reset.js
+++ b/unpublishedScripts/DomainContent/Home/reset.js
@@ -37,6 +37,12 @@
 
     Script.include(kineticPath);
 
+    var center = Vec3.sum(Vec3.sum(MyAvatar.position, {
+        x: 0,
+        y: 0.5,
+        z: 0
+    }), Vec3.multiply(1, Quat.getFront(Camera.getOrientation())));
+
     Reset.prototype = {
         tidying: false,
 
@@ -174,11 +180,7 @@
 
         createKineticEntities: function() {
 
-            var center = Vec3.sum(Vec3.sum(MyAvatar.position, {
-                x: 0,
-                y: 0.5,
-                z: 0
-            }), Vec3.multiply(1, Quat.getFront(Camera.getOrientation())));
+
 
             var fruitBowl = new FruitBowl({
                 x: 1105.3185,
@@ -252,6 +254,10 @@
             kineticEntities.forEach(function(kineticEntity) {
                 kineticEntity.cleanup();
             })
+        },
+        unload: function() {
+            this.cleanupDynamicEntities();
+            this.cleanupKineticEntities();
         }
 
     }
diff --git a/unpublishedScripts/DomainContent/Home/tiltMaze/maze.js b/unpublishedScripts/DomainContent/Home/tiltMaze/maze.js
index 4d8ed7ed70..74b7f16949 100644
--- a/unpublishedScripts/DomainContent/Home/tiltMaze/maze.js
+++ b/unpublishedScripts/DomainContent/Home/tiltMaze/maze.js
@@ -13,7 +13,7 @@
 
 (function() {
 
-    Script.include('../utils.js');
+    // Script.include('../utils.js');
 
     var SCALE = 0.5;
     var VICTORY_SOUND;