diff --git a/addons/compat_rhs_afrf3/compat_rhs_afrf3_csw/CfgVehicles.hpp b/addons/compat_rhs_afrf3/compat_rhs_afrf3_csw/CfgVehicles.hpp
index fd889cd096..6a3bb0a083 100644
--- a/addons/compat_rhs_afrf3/compat_rhs_afrf3_csw/CfgVehicles.hpp
+++ b/addons/compat_rhs_afrf3/compat_rhs_afrf3_csw/CfgVehicles.hpp
@@ -5,7 +5,6 @@ class CfgVehicles {
     class StaticGrenadeLauncher;
 
     class rhs_SPG9_base: AT_01_base_F {
-        // ENABLE_CSW_ATTRIBUTE;
         class ACE_CSW {
             enabled = 1;
             proxyWeapon = QGVAR(rhs_weap_SPG9);
@@ -26,7 +25,6 @@ class CfgVehicles {
     };
 
     class rhs_Kornet_Base: AT_01_base_F {
-        // ENABLE_CSW_ATTRIBUTE;
         class ACE_CSW {
             enabled = 1;
             proxyWeapon = QGVAR(rhs_weap_9K133_launcher);
@@ -40,7 +38,6 @@ class CfgVehicles {
     };
 
     class rhs_Metis_Base: AT_01_base_F {
-        // ENABLE_CSW_ATTRIBUTE;
         class ACE_CSW {
             enabled = 1;
             proxyWeapon = QGVAR(rhs_weap_9K115_2_launcher);
@@ -54,7 +51,6 @@ class CfgVehicles {
     };
 
     class rhs_2b14_82mm_Base: StaticMortar {
-        // ENABLE_CSW_ATTRIBUTE;
         class ACE_CSW {
             enabled = 1;
             magazineLocation = "";
@@ -99,7 +95,6 @@ class CfgVehicles {
     };
 
     class RHS_AGS30_TriPod_base: StaticGrenadeLauncher {
-        // ENABLE_CSW_ATTRIBUTE;
         class ACE_CSW {
             enabled = 1;
             proxyWeapon = QGVAR(rhs_weap_AGS30);
diff --git a/addons/compat_rhs_gref3/compat_rhs_gref3_csw/CfgVehicles.hpp b/addons/compat_rhs_gref3/compat_rhs_gref3_csw/CfgVehicles.hpp
index 220aec4c24..7e58387dab 100644
--- a/addons/compat_rhs_gref3/compat_rhs_gref3_csw/CfgVehicles.hpp
+++ b/addons/compat_rhs_gref3/compat_rhs_gref3_csw/CfgVehicles.hpp
@@ -1,7 +1,6 @@
 class CfgVehicles {
     class StaticMGWeapon;
     class rhs_DSHKM_base: StaticMGWeapon {
-        // ENABLE_CSW_ATTRIBUTE;
         class ACE_CSW {
             enabled = 1;
             proxyWeapon = QGVAR(rhs_weap_DSHKM);
diff --git a/addons/csw/Cfg3den.hpp b/addons/csw/Cfg3den.hpp
deleted file mode 100644
index 5d15e19d6b..0000000000
--- a/addons/csw/Cfg3den.hpp
+++ /dev/null
@@ -1,43 +0,0 @@
-class ctrlCombo;
-class Cfg3DEN {
-    class Attributes {
-        class Default;
-        class Title: Default {
-            class Controls {
-                class Title;
-            };
-        };
-        class Combo: Title {
-           class Controls: Controls {
-                class Title: Title {};
-                class Value;
-            };
-        };
-        class GVAR(assemblyModeControl): Combo {
-            class Controls: Controls {
-                class Title: Title {};
-                class Value: Value {
-                    class Items {
-                        class Disable {
-                            text = "$STR_DISABLED";
-                            value = 0;
-                        };
-                        class Enable {
-                            text = "$STR_CONFIG_JOYSTICK_ENABLED";
-                            value = 1;
-                        };
-                        class EnableAndEmpty {
-                            text = CSTRING(eden_enableAndEmpty);
-                            value = 2;
-                        };
-                        class Default {
-                            text = "$STR_VEHICLE_DEFAULT";
-                            value = 3;
-                            default = 1;
-                        };
-                    };
-                };
-            };
-        };
-    };
-};
diff --git a/addons/csw/CfgVehicles.hpp b/addons/csw/CfgVehicles.hpp
index 424289c077..724d5ed513 100644
--- a/addons/csw/CfgVehicles.hpp
+++ b/addons/csw/CfgVehicles.hpp
@@ -138,7 +138,6 @@ class CfgVehicles {
     class StaticMGWeapon: StaticWeapon {};
 
     class HMG_01_base_F: StaticMGWeapon {
-        // ENABLE_CSW_ATTRIBUTE;
         class ADDON {
             enabled = 1;
             proxyWeapon = QGVAR(HMG_Static);
@@ -198,7 +197,6 @@ class CfgVehicles {
 
     class GMG_TriPod;
     class GMG_01_base_F: GMG_TriPod {
-        // ENABLE_CSW_ATTRIBUTE;
         class ADDON {
             enabled = 1;
             proxyWeapon = QGVAR(GMG_20mm); // Weapon Proxy (Shorter Reload Time) [CfgWeapons]
@@ -232,7 +230,6 @@ class CfgVehicles {
 
 
     class AT_01_base_F: StaticMGWeapon {
-        // ENABLE_CSW_ATTRIBUTE;
         class ADDON {
             enabled = 1;
             proxyWeapon = QGVAR(Titan_AT_Static);
@@ -246,7 +243,6 @@ class CfgVehicles {
     };
 
     class AA_01_base_F: StaticMGWeapon {
-        // ENABLE_CSW_ATTRIBUTE;
         class ADDON {
             enabled = 1;
             proxyWeapon = QGVAR(Titan_AA_Static); // Weapon Proxy (Shorter Reload Time) [CfgWeapons]
@@ -262,7 +258,6 @@ class CfgVehicles {
 
     class StaticMortar: StaticWeapon {};
     class Mortar_01_base_F: StaticMortar {
-        // ENABLE_CSW_ATTRIBUTE;
         class ADDON {
             enabled = 1;
             magazineLocation = "";
diff --git a/addons/csw/config.cpp b/addons/csw/config.cpp
index 98abcea5c0..aab2b0416f 100644
--- a/addons/csw/config.cpp
+++ b/addons/csw/config.cpp
@@ -15,7 +15,6 @@ class CfgPatches {
     };
 };
 
-#include "Cfg3den.hpp"
 #include "CfgEventHandlers.hpp"
 #include "CfgVehicles.hpp"
 #include "CfgWeapons.hpp"
diff --git a/addons/csw/script_config_macros_csw.hpp b/addons/csw/script_config_macros_csw.hpp
index 1a0e1b3be5..6701159f29 100644
--- a/addons/csw/script_config_macros_csw.hpp
+++ b/addons/csw/script_config_macros_csw.hpp
@@ -1,15 +1 @@
 #define CREATE_CSW_PROXY(weapon) class ##weapon; class GVAR(weapon): ##weapon { magazineReloadTime = 0.5; }
-
-// Need to be careful about breaking Attributes inheritance, doesn't seem to be any standard
-#define ENABLE_CSW_ATTRIBUTE class Attributes { \
-        class EGVAR(CSW,assemblyMode) { \
-            property = QEGVAR(CSW,assemblyMode); \
-            control = QEGVAR(CSW,assemblyModeControl); \
-            displayName = ECSTRING(CSW,eden_enableCSW); \
-            tooltip = ECSTRING(CSW,eden_enableCSW_tooltip); \
-            expression = QUOTE( if (_value != 3) then {_this setVariable [ARR_3('%s',_value,true)]} ); \
-            typeName = "NUMBER"; \
-            condition = "objectVehicle"; \
-            defaultValue = 3; \
-        }; \
-    }