diff --git a/FloatingSpace/NoteSets.js b/FloatingSpace/NoteSets.js
index a5acfa44f..c10eb6121 100644
--- a/FloatingSpace/NoteSets.js
+++ b/FloatingSpace/NoteSets.js
@@ -23,7 +23,8 @@ function newNoteSets () {
   let thisObject = {
     createNoteSet: createNoteSet,
     destroyNoteSet: destroyNoteSet,
-    initialize: initialize
+    initialize: initialize,
+    finalize: finalize
   }
 
   let noteSets = []
@@ -35,6 +36,11 @@ function newNoteSets () {
     floatingLayer = pFloatingLayer
   }
 
+  function finalize () {
+    floatingLayer.finalize()
+    floatingLayer = undefined
+  }
+
   function createNoteSet (pPayload, pEventHandler, callBackFunction) {
     try {
             /*
diff --git a/FloatingSpace/ProfileBalls.js b/FloatingSpace/ProfileBalls.js
index 627bb7fe8..136e6d9be 100644
--- a/FloatingSpace/ProfileBalls.js
+++ b/FloatingSpace/ProfileBalls.js
@@ -25,20 +25,15 @@ function newProfileBalls () {
 
   return thisObject
 
-  function finalize () {
-    try {
-      if (INFO_LOG === true) { logger.write('[INFO] finalize -> Entering function.') }
-
-      floatingLayer.finalize()
-    } catch (err) {
-      if (ERROR_LOG === true) { logger.write('[ERROR] finalize -> err = ' + err.stack) }
-    }
-  }
-
   function initialize (pFloatingLayer) {
     floatingLayer = pFloatingLayer
   }
 
+  function finalize () {
+    floatingLayer.finalize()
+    floatingLayer = undefined
+  }
+
   function createNewProfileBall (pPayload, callBackFunction) {
     let floatingObject = newFloatingObject()
     floatingObject.initialize('Profile Ball', '', floatingLayer, onInitialized)
diff --git a/FloatingSpace/StrategyPart.js b/FloatingSpace/StrategyPart.js
index a67650352..12842d9ba 100644
--- a/FloatingSpace/StrategyPart.js
+++ b/FloatingSpace/StrategyPart.js
@@ -39,7 +39,7 @@ function newStrategyPart () {
             angle: 60
           },
           {
-            label: 'Delete',
+            label: 'Delete This Strategy',
             visible: false,
             imagePathOn: 'Images/icons/style-01/trash.png',
             imagePathOff: 'Images/icons/style-01/target.png',
@@ -164,7 +164,7 @@ function newStrategyPart () {
             angle: 20 * 1
           },
           {
-            label: 'Delete',
+            label: 'Delete This Phase',
             visible: false,
             imagePathOn: 'Images/icons/style-01/trash.png',
             imagePathOff: 'Images/icons/style-01/target.png',
@@ -189,7 +189,7 @@ function newStrategyPart () {
             angle: 60
           },
           {
-            label: 'Delete',
+            label: 'Delete This Situation',
             visible: false,
             imagePathOn: 'Images/icons/style-01/trash.png',
             imagePathOff: 'Images/icons/style-01/target.png',
@@ -214,7 +214,7 @@ function newStrategyPart () {
             angle: 60
           },
           {
-            label: 'Delete',
+            label: 'Delete This Condition',
             visible: false,
             imagePathOn: 'Images/icons/style-01/trash.png',
             imagePathOff: 'Images/icons/style-01/target.png',
diff --git a/FloatingSpace/StrategyParts.js b/FloatingSpace/StrategyParts.js
index 53f50272b..da2a6bb88 100644
--- a/FloatingSpace/StrategyParts.js
+++ b/FloatingSpace/StrategyParts.js
@@ -26,6 +26,7 @@ function newStrategyParts () {
 
   function finalize () {
     floatingLayer.finalize()
+    floatingLayer = undefined
   }
 
   function initialize (pFloatingLayer) {
diff --git a/Spaces/FloatingSpace.js b/Spaces/FloatingSpace.js
index e7f6e494d..810ca77b6 100644
--- a/Spaces/FloatingSpace.js
+++ b/Spaces/FloatingSpace.js
@@ -1,7 +1,6 @@
  
 function newFloatingSpace () {
   const MODULE_NAME = 'Floating Space'
-  const INFO_LOG = false
   const ERROR_LOG = true
     /*
     The Floating Space is the place where floating elements like floatingObjects, live and are rendered.
@@ -20,15 +19,10 @@ function newFloatingSpace () {
   return thisObject
 
   function finalize () {
-    try {
-      if (INFO_LOG === true) { logger.write('[INFO] finalize -> Entering function.') }
-
-      thisObject.floatingLayer.finalize()
-      thisObject.profileBalls.finalize()
-      thisObject.strategyParts.finalize()
-    } catch (err) {
-      if (ERROR_LOG === true) { logger.write('[ERROR] finalize -> err = ' + err.stack) }
-    }
+    thisObject.floatingLayer.finalize()
+    thisObject.profileBalls.finalize()
+    thisObject.strategyParts.finalize()
+    thisObject.noteSets.finalize()
   }
 
   function initialize (callBackFunction) {