diff --git a/modules/iswa/rendering/dataplane.cpp b/modules/iswa/rendering/dataplane.cpp
index a633f051b8..b623d9022c 100644
--- a/modules/iswa/rendering/dataplane.cpp
+++ b/modules/iswa/rendering/dataplane.cpp
@@ -204,10 +204,10 @@ void DataPlane::subscribeToGroup(){
 
     groupEvent->subscribe(name(), "normValuesChanged", [&](ghoul::Dictionary dict){
         LDEBUG(name() + " Event normValuesChanged");
-        std::shared_ptr<glm::vec2> values;
+        glm::vec2 values;
         bool success = dict.getValue("normValues", values);
         if(success){
-            _normValues.setValue(*values);            
+            _normValues.setValue(values);            
         }
     });
 
@@ -218,10 +218,10 @@ void DataPlane::subscribeToGroup(){
 
     groupEvent->subscribe(name(), "dataOptionsChanged", [&](ghoul::Dictionary dict){
         LDEBUG(name() + " Event dataOptionsChanged");
-        std::shared_ptr<std::vector<int> > values;
-        bool success = dict.getValue("dataOptions", values);
+        std::vector<int> values;
+        bool success = dict.getValue<std::vector<int> >("dataOptions", values);
         if(success){
-            _dataOptions.setValue(*values);            
+            _dataOptions.setValue(values);            
         }
     });
 
@@ -232,10 +232,10 @@ void DataPlane::subscribeToGroup(){
 
     groupEvent->subscribe(name(), "backgroundValuesChanged", [&](ghoul::Dictionary dict){
         LDEBUG(name() + " Event backgroundValuesChanged");
-        std::shared_ptr<glm::vec2> values;
+        glm::vec2 values;
         bool success = dict.getValue("backgroundValues", values);
         if(success){
-            _backgroundValues.setValue(*values);            
+            _backgroundValues.setValue(values);            
         }
     });
 
diff --git a/modules/iswa/rendering/datasphere.cpp b/modules/iswa/rendering/datasphere.cpp
index 0168b0fe43..f68a267101 100644
--- a/modules/iswa/rendering/datasphere.cpp
+++ b/modules/iswa/rendering/datasphere.cpp
@@ -179,10 +179,10 @@ void DataSphere::subscribeToGroup(){
 
     groupEvent->subscribe(name(), "normValuesChanged", [&](ghoul::Dictionary dict){
         LDEBUG(name() + " Event normValuesChanged");
-        std::shared_ptr<glm::vec2> values;
+        glm::vec2 values;
         bool success = dict.getValue("normValues", values);
         if(success){
-            _normValues.setValue(*values);            
+            _normValues.setValue(values);            
         }
     });
 
@@ -193,10 +193,10 @@ void DataSphere::subscribeToGroup(){
 
     groupEvent->subscribe(name(), "dataOptionsChanged", [&](ghoul::Dictionary dict){
         LDEBUG(name() + " Event dataOptionsChanged");
-        std::shared_ptr<std::vector<int> > values;
-        bool success = dict.getValue("dataOptions", values);
+        std::vector<int> values;
+        bool success = dict.getValue<std::vector<int> >("dataOptions", values);
         if(success){
-            _dataOptions.setValue(*values);            
+            _dataOptions.setValue(values);            
         }
     });
 
@@ -207,10 +207,10 @@ void DataSphere::subscribeToGroup(){
 
     groupEvent->subscribe(name(), "backgroundValuesChanged", [&](ghoul::Dictionary dict){
         LDEBUG(name() + " Event backgroundValuesChanged");
-        std::shared_ptr<glm::vec2> values;
+        glm::vec2 values;
         bool success = dict.getValue("backgroundValues", values);
         if(success){
-            _backgroundValues.setValue(*values);            
+            _backgroundValues.setValue(values);            
         }
     });
 
diff --git a/modules/iswa/rendering/iswadatagroup.cpp b/modules/iswa/rendering/iswadatagroup.cpp
index 71f9bf5bc1..fbe7bb9723 100644
--- a/modules/iswa/rendering/iswadatagroup.cpp
+++ b/modules/iswa/rendering/iswadatagroup.cpp
@@ -104,12 +104,12 @@ void IswaDataGroup::registerProperties(){
 
     _normValues.onChange([this]{
         LDEBUG("Group " + name() + " published normValuesChanged");
-        _groupEvent->publish("normValuesChanged", ghoul::Dictionary({{"normValues", std::make_shared<glm::vec2>(_normValues.value())}}));
+        _groupEvent->publish("normValuesChanged", ghoul::Dictionary({{"normValues", _normValues.value()}}));
     });
 
     _backgroundValues.onChange([this]{
         LDEBUG("Group " + name() + " published backgroundValuesChanged");
-        _groupEvent->publish("backgroundValuesChanged", ghoul::Dictionary({{"backgroundValues", std::make_shared<glm::vec2>(_backgroundValues.value())}}));
+        _groupEvent->publish("backgroundValuesChanged", ghoul::Dictionary({{"backgroundValues", _backgroundValues.value()}}));
     });
 
     _transferFunctionsFile.onChange([this]{
@@ -119,7 +119,9 @@ void IswaDataGroup::registerProperties(){
 
     _dataOptions.onChange([this]{
         LDEBUG("Group " + name() + " published dataOptionsChanged");
-        _groupEvent->publish("dataOptionsChanged", ghoul::Dictionary({{"dataOptions", std::make_shared<std::vector<int> >(_dataOptions.value())}}));
+        ghoul::Dictionary dict;
+        dict.setValue<std::vector<int>>("dataOptions", _dataOptions.value());
+        _groupEvent->publish("dataOptionsChanged", dict);
     });
 }
 
diff --git a/modules/iswa/rendering/kameleonplane.cpp b/modules/iswa/rendering/kameleonplane.cpp
index 798898cb71..fb35e6cdb4 100644
--- a/modules/iswa/rendering/kameleonplane.cpp
+++ b/modules/iswa/rendering/kameleonplane.cpp
@@ -323,10 +323,10 @@ void KameleonPlane::subscribeToGroup(){
 
     groupEvent->subscribe(name(), "normValuesChanged", [&](ghoul::Dictionary dict){
         LDEBUG(name() + " Event normValuesChanged");
-        std::shared_ptr<glm::vec2> values;
+        glm::vec2 values;
         bool success = dict.getValue("normValues", values);
         if(success){
-            _normValues.setValue(*values);            
+            _normValues.setValue(values);            
         }
     });
 
@@ -337,10 +337,10 @@ void KameleonPlane::subscribeToGroup(){
 
     groupEvent->subscribe(name(), "dataOptionsChanged", [&](ghoul::Dictionary dict){
         LDEBUG(name() + " Event dataOptionsChanged");
-        std::shared_ptr<std::vector<int> > values;
-        bool success = dict.getValue("dataOptions", values);
+        std::vector<int> values;
+        bool success = dict.getValue<std::vector<int> >("dataOptions", values);
         if(success){
-            _dataOptions.setValue(*values);            
+            _dataOptions.setValue(values);            
         }
     });
 
@@ -351,10 +351,10 @@ void KameleonPlane::subscribeToGroup(){
 
     groupEvent->subscribe(name(), "backgroundValuesChanged", [&](ghoul::Dictionary dict){
         LDEBUG(name() + " Event backgroundValuesChanged");
-        std::shared_ptr<glm::vec2> values;
+        glm::vec2 values;
         bool success = dict.getValue("backgroundValues", values);
         if(success){
-            _backgroundValues.setValue(*values);            
+            _backgroundValues.setValue(values);            
         }
     });
 
diff --git a/modules/iswa/util/iswamanager.cpp b/modules/iswa/util/iswamanager.cpp
index 3cea015b37..3dec502c8f 100644
--- a/modules/iswa/util/iswamanager.cpp
+++ b/modules/iswa/util/iswamanager.cpp
@@ -153,15 +153,6 @@ void IswaManager::addIswaCygnet(int id, std::string type, std::string group){
             }
         );
     }
-    // else{
-    //     // Kameleonplane?
-    //     // LERROR("No cygnet with id 0");
-    //     std::string kwPath = "${OPENSPACE_DATA}/BATSRUS.cdf";
-    //     if(type == "x" || type == "y" || type == "z")
-    //         createKameleonPlane(kwPath, type, group);
-    //     else
-    //         createKameleonPlane(kwPath, "z", group);
-    // }
 }
 
 void IswaManager::addKameleonCdf(std::string groupName, int pos){
@@ -537,7 +528,6 @@ void IswaManager::createKameleonPlane(CdfInfo info, std::string cut){
 
         std::string luaTable = parseKWToLuaTable(info, cut);
         if(!luaTable.empty()){
-    //         // std::cout << luaTable << std::endl;
             std::string script = "openspace.addSceneGraphNode(" + luaTable + ");";
             OsEng.scriptEngine().queueScript(script);
         }