diff --git a/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp b/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp
index 82ffc6d007..e961da0722 100644
--- a/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp
@@ -4,6 +4,7 @@
 //
 //  Created by Seth Alves on 5/19/15.
 //  Copyright 2015 High Fidelity, Inc.
+//  Copyright 2022 Overte e.V.
 //
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
@@ -1030,12 +1031,6 @@ void RenderablePolyVoxEntityItem::uncompressVolumeData() {
         quint16 voxelYDataSize = voxelYSize;
         quint16 voxelZDataSize = voxelZSize;
         
-        /*if(entity->isEdged()){
-            voxelXDataSize++;
-            voxelYDataSize++;
-            voxelZDataSize++;
-        }*/
-        
         int rawSize = voxelXDataSize * voxelYDataSize * voxelZDataSize;
 
         QByteArray compressedData;
@@ -1064,9 +1059,6 @@ void RenderablePolyVoxEntityItem::setVoxelsFromData(QByteArray uncompressedData,
     withWriteLock([&] {
         if (isEdged()) {
             low += 1;
-            //voxelXSize += 2;
-            //voxelYSize += 2;
-            //voxelZSize += 2;
         }
         loop3(ivec3(0), ivec3(voxelXSize, voxelYSize, voxelZSize), [&](const ivec3& v) {
             int uncompressedIndex = (v.z * (voxelYSize) * (voxelXSize)) + (v.y * (voxelZSize)) + v.x;
diff --git a/libraries/entities/src/EntityItemProperties.cpp b/libraries/entities/src/EntityItemProperties.cpp
index 20a6970052..24dd883141 100644
--- a/libraries/entities/src/EntityItemProperties.cpp
+++ b/libraries/entities/src/EntityItemProperties.cpp
@@ -5,6 +5,7 @@
 //  Created by Brad Hefta-Gaub on 12/4/13.
 //  Copyright 2013 High Fidelity, Inc.
 //  Copyright 2020 Vircadia contributors.
+//  Copyright 2022 Overte e.V.
 //
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
diff --git a/scripts/system/create/entityProperties/html/js/entityProperties.js b/scripts/system/create/entityProperties/html/js/entityProperties.js
index 908ad7fe28..20da201250 100644
--- a/scripts/system/create/entityProperties/html/js/entityProperties.js
+++ b/scripts/system/create/entityProperties/html/js/entityProperties.js
@@ -3,6 +3,7 @@
 //  Created by Ryan Huffman on 13 Nov 2014
 //  Copyright 2014 High Fidelity, Inc.
 //  Copyright 2020 Vircadia contributors.
+//  Copyright 2022 Overte e.V.
 //
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
@@ -1349,14 +1350,14 @@ const GROUPS = [
                 onDropdownChange: createPolyVoxPresetChangedFunction,
                 skipPropertyUpdate: true,
             },
-            /*{
+            {
                 label: "Surface Style",
                 type: "dropdown",
                 options: { 0: "Marching cubes", 1: "Cubic", 
                            2: "Edged cubic", 3: "Edged marching cubes" },
                 propertyID: "voxelSurfaceStyle",
                 propertyName: "voxelSurfaceStyle",
-            },*/
+            },
             {
                 label: "X Texture URL",
                 type: "string",
diff --git a/scripts/system/create/entitySelectionTool/entitySelectionTool.js b/scripts/system/create/entitySelectionTool/entitySelectionTool.js
index 7ce8edd70f..c5d4838917 100644
--- a/scripts/system/create/entitySelectionTool/entitySelectionTool.js
+++ b/scripts/system/create/entitySelectionTool/entitySelectionTool.js
@@ -6,6 +6,7 @@
 //    Modified by David Back on 1/9/2018
 //  Copyright 2014 High Fidelity, Inc.
 //  Copyright 2020 Vircadia contributors
+//  Copyright 2022 Overte e.V.
 //
 //  This script implements a class useful for building tools for editing entities.
 //
diff --git a/scripts/system/html/js/gridControls.js b/scripts/system/html/js/gridControls.js
index 6f12825772..427b9f9c17 100644
--- a/scripts/system/html/js/gridControls.js
+++ b/scripts/system/html/js/gridControls.js
@@ -24,10 +24,7 @@ function loaded() {
         elVoxelHelpPopup = document.getElementById("voxel-help-popup");
 
         elVoxelSphereSize = document.getElementById("voxel-sphere-size");
-        //elVoxelEditDynamics = document.getElementById("voxel-edit-dynamics");
         elVoxelRemove = document.getElementById("voxel-remove");
-        //elVoxelPointerMode = document.getElementById("voxel-pointer-mode");
-        //elVoxelBrushLength = document.getElementById("voxel-brush-length");
         
         elPosY = document.getElementById("horiz-y");
         elMinorSpacing = document.getElementById("minor-spacing");
@@ -179,19 +176,13 @@ function loaded() {
                     createAppMode: createAppModeValue,
                     voxelEditMode: voxelEditModeValue,
                     voxelSphereSize: elVoxelSphereSize.value,
-                    //voxelEditDynamics: elVoxelEditDynamics.value,
                     voxelRemove: elVoxelRemove.checked,
-                    //voxelPointerMode: elVoxelPointerMode.value,
-                    //voxelBrushLength: elVoxelBrushLength.value,
                 }));
             }
         }
 
         elVoxelSphereSize.addEventListener("change", emitUpdateEditTools);
-        //elVoxelEditDynamics.addEventListener("change", emitUpdateEditTools);
         elVoxelRemove.addEventListener("change", emitUpdateEditTools);
-        //elVoxelPointerMode.addEventListener("change", emitUpdateEditTools);
-        //elVoxelBrushLength.addEventListener("change", emitUpdateEditTools);
         
         elPosY.addEventListener("change", emitUpdate);
         elMinorSpacing.addEventListener("change", emitUpdate);