diff --git a/optionals/compat_cup/$PBOPREFIX$ b/optionals/compat_cup/$PBOPREFIX$
deleted file mode 100644
index 42044805ba..0000000000
--- a/optionals/compat_cup/$PBOPREFIX$
+++ /dev/null
@@ -1 +0,0 @@
-z\ace\addons\compat_cup
\ No newline at end of file
diff --git a/optionals/compat_cup/CfgMagazines.hpp b/optionals/compat_cup/CfgMagazines.hpp
deleted file mode 100644
index b05b0c3efd..0000000000
--- a/optionals/compat_cup/CfgMagazines.hpp
+++ /dev/null
@@ -1,48 +0,0 @@
-class CfgMagazines {
-    class CUP_M136_M;
-    class CUP_RPG18_M;
-    class CUP_NLAW_M;
-    class ACE_PreloadedMissileDummy_CUP: CUP_M136_M {              // The dummy magazine
-        author = "$STR_ACE_Common_ACETeam";
-        scope = 1;
-        scopeArsenal = 1;
-        displayName = "Preloaded Missle";
-        //displayName = "$STR_ACE_Disposable_PreloadedMissileDummy";
-        picture = PATHTOEF(common,UI\blank_CO.paa);
-        weaponPoolAvailable = 0;
-        mass = 0;
-    };
-    class ACE_FiredMissileDummy_CUP: ACE_PreloadedMissileDummy_CUP {
-        count = 0;
-    };
-    class ACE_UsedTube_M136_F: CUP_M136_M {
-        author = "$STR_ACE_Common_ACETeam";
-        displayName = "$STR_ACE_Disposable_UsedTube";
-        descriptionShort = "$STR_ACE_Disposable_UsedTubeDescription";
-        displayNameShort = "-";
-        count = 0;
-        weaponPoolAvailable = 0;
-        modelSpecial = "";
-        mass = 0;
-    };
-    class ACE_UsedTube_RPG18_F: CUP_RPG18_M {
-        author = "$STR_ACE_Common_ACETeam";
-        displayName = "$STR_ACE_Disposable_UsedTube";
-        descriptionShort = "$STR_ACE_Disposable_UsedTubeDescription";
-        displayNameShort = "-";
-        count = 0;
-        weaponPoolAvailable = 0;
-        modelSpecial = "";
-        mass = 0;
-    };
-    class ACE_UsedTube_NLAW_F: CUP_NLAW_M {
-        author = "$STR_ACE_Common_ACETeam";
-        displayName = "$STR_ACE_Disposable_UsedTube";
-        descriptionShort = "$STR_ACE_Disposable_UsedTubeDescription";
-        displayNameShort = "-";
-        count = 0;
-        weaponPoolAvailable = 0;
-        modelSpecial = "";
-        mass = 0;
-    };
-};
\ No newline at end of file
diff --git a/optionals/compat_cup/CfgWeapons.hpp b/optionals/compat_cup/CfgWeapons.hpp
deleted file mode 100644
index bbd49548da..0000000000
--- a/optionals/compat_cup/CfgWeapons.hpp
+++ /dev/null
@@ -1,271 +0,0 @@
-class CfgWeapons
-{
-    class Launcher_Base_F;
-    class ItemCore;
-    class InventoryOpticsItem_Base_F;
-    
-    class CUP_optic_SB_3_12x50_PMII : ItemCore {
-        ACE_ScopeAdjust_Vertical[] = { -4, 30 };
-        ACE_ScopeAdjust_Horizontal[] = { -6, 6 };
-        ACE_ScopeAdjust_VerticalIncrement = 0.1;
-        ACE_ScopeAdjust_HorizontalIncrement = 0.1;
-        class ItemInfo : InventoryOpticsItem_Base_F {
-            class OpticsModes {
-                class LRR {
-                    discreteDistance[] = { 100 };
-                    discreteDistanceInitIndex = 0;
-                };
-            };
-        };
-    };
-    class CUP_optic_LeupoldMk4 : ItemCore {
-        ACE_ScopeAdjust_Vertical[] = { -4, 30 };
-        ACE_ScopeAdjust_Horizontal[] = { -6, 6 };
-        ACE_ScopeAdjust_VerticalIncrement = 0.1;
-        ACE_ScopeAdjust_HorizontalIncrement = 0.1;
-        class ItemInfo : InventoryOpticsItem_Base_F {
-            class OpticsModes {
-                class LRR {
-                    discreteDistance[] = { 100 };
-                    discreteDistanceInitIndex = 0;
-                };
-            };
-        };
-    };
-    class CUP_optic_Leupold_VX3 : ItemCore {
-        ACE_ScopeAdjust_Vertical[] = { -4, 30 };
-        ACE_ScopeAdjust_Horizontal[] = { -6, 6 };
-        ACE_ScopeAdjust_VerticalIncrement = 0.1;
-        ACE_ScopeAdjust_HorizontalIncrement = 0.1;
-        class ItemInfo : InventoryOpticsItem_Base_F {
-            class OpticsModes {
-                class StepScope {
-                    discreteDistance[] = { 100 };
-                    discreteDistanceInitIndex = 0;
-                };
-            };
-        };
-    };
-    class CUP_optic_AN_PVS_10 : ItemCore {
-        ACE_ScopeAdjust_Vertical[] = { -4, 30 };
-        ACE_ScopeAdjust_Horizontal[] = { -6, 6 };
-        ACE_ScopeAdjust_VerticalIncrement = 0.1;
-        ACE_ScopeAdjust_HorizontalIncrement = 0.1;
-        class ItemInfo : InventoryOpticsItem_Base_F {
-            class OpticsModes {
-                class NVScope {
-                    discreteDistance[] = { 100 };
-                    discreteDistanceInitIndex = 0;
-                };
-            };
-        };
-    };
-    class CUP_optic_LeupoldM3LR : ItemCore {
-        ACE_ScopeAdjust_Vertical[] = { -4, 30 };
-        ACE_ScopeAdjust_Horizontal[] = { -6, 6 };
-        ACE_ScopeAdjust_VerticalIncrement = 0.1;
-        ACE_ScopeAdjust_HorizontalIncrement = 0.1;
-        class ItemInfo : InventoryOpticsItem_Base_F {
-            class OpticsModes {
-                class LRR {
-                    discreteDistance[] = { 100 };
-                    discreteDistanceInitIndex = 0;
-                };
-            };
-        };
-    };
-    class CUP_optic_LeupoldMk4_10x40_LRT_Desert : ItemCore {
-        ACE_ScopeAdjust_Vertical[] = { -4, 30 };
-        ACE_ScopeAdjust_Horizontal[] = { -6, 6 };
-        ACE_ScopeAdjust_VerticalIncrement = 0.1;
-        ACE_ScopeAdjust_HorizontalIncrement = 0.1;
-        class ItemInfo : InventoryOpticsItem_Base_F {
-            class OpticsModes {
-                class LRR {
-                    discreteDistance[] = { 100 };
-                    discreteDistanceInitIndex = 0;
-                };
-            };
-        };
-    };
-    class CUP_optic_LeupoldMk4_MRT_tan : ItemCore {
-        ACE_ScopeAdjust_Vertical[] = { -4, 30 };
-        ACE_ScopeAdjust_Horizontal[] = { -6, 6 };
-        ACE_ScopeAdjust_VerticalIncrement = 0.1;
-        ACE_ScopeAdjust_HorizontalIncrement = 0.1;
-        class ItemInfo : InventoryOpticsItem_Base_F {
-            class OpticsModes {
-                class MRT {
-                    discreteDistance[] = { 100 };
-                    discreteDistanceInitIndex = 0;
-                };
-            };
-        };
-    };
-    class CUP_optic_SB_11_4x20_PM : ItemCore {
-        ACE_ScopeAdjust_Vertical[] = { -0.1, 10.1 };
-        ACE_ScopeAdjust_Horizontal[] = { -5.1, 5.1 };
-        ACE_ScopeAdjust_VerticalIncrement = 0.1;
-        ACE_ScopeAdjust_HorizontalIncrement = 0.1;
-        class ItemInfo : InventoryOpticsItem_Base_F {
-            class OpticsModes {
-                class ShortDot {
-                    discreteDistance[] = { 100 };
-                    discreteDistanceInitIndex = 0;
-                };
-            };
-        };
-    };
-    
-    /*
-    // This would require MOA turrets
-    class CUP_optic_AN_PVS_4 : ItemCore {
-        ACE_ScopeAdjust_Vertical[] = { -12, 50 };
-        ACE_ScopeAdjust_Horizontal[] = { -20, 20 };
-        ACE_ScopeAdjust_VerticalIncrement = 0.25;
-        ACE_ScopeAdjust_HorizontalIncrement = 0.25;
-        ACE_ScopeAdjust_Unit = "MOA";
-        class ItemInfo : InventoryOpticsItem_Base_F {
-            class OpticsModes {
-                class ANPVS4 {
-                    discreteDistance[] = { 100 };
-                    discreteDistanceInitIndex = 0;
-                };
-            };
-        };
-    };
-    */
-    
-    class CUP_optic_PSO_1 : ItemCore {
-        ACE_ScopeAdjust_Vertical[] = { 0, 0 };
-        ACE_ScopeAdjust_Horizontal[] = { -10, 10 };
-        ACE_ScopeAdjust_VerticalIncrement = 0.0;
-        ACE_ScopeAdjust_HorizontalIncrement = 0.5;
-        class ItemInfo : InventoryOpticsItem_Base_F {
-            class OpticsModes {
-                class PSO {
-                    discreteDistance[]={100, 200, 300, 400, 450, 500, 550, 600, 650, 700, 750, 800, 850, 900, 950, 1000};
-                    discreteDistanceInitIndex=3;
-                };
-            };
-        };
-    };
-    class CUP_optic_PSO_3 : ItemCore {
-        ACE_ScopeAdjust_Vertical[] = { 0, 0 };
-        ACE_ScopeAdjust_Horizontal[] = { -10, 10 };
-        ACE_ScopeAdjust_VerticalIncrement = 0.0;
-        ACE_ScopeAdjust_HorizontalIncrement = 0.5;
-        class ItemInfo : InventoryOpticsItem_Base_F {
-            class OpticsModes {
-                class PSO {
-                    discreteDistance[]={100, 200, 300, 400, 450, 500, 550, 600, 650, 700, 750, 800, 850, 900, 950, 1000};
-                    discreteDistanceInitIndex=3;
-                };
-            };
-        };
-    };
-    // Non Disposable launchers
-    class CUP_launch_Igla: Launcher_Base_F {
-        EGVAR(overpressure,angle) = 30;
-        EGVAR(overpressure,range) = 2;
-        EGVAR(overpressure,damage) = 0.5;
-    };
-    class CUP_launch_M47: Launcher_Base_F {
-        EGVAR(overpressure,angle) = 45;
-        EGVAR(overpressure,range) = 30;
-        EGVAR(overpressure,damage) = 0.7;
-    };
-    class CUP_launch_MAAWS: Launcher_Base_F {
-        EGVAR(overpressure,angle) = 60;
-        EGVAR(overpressure,range) = 28;
-        EGVAR(overpressure,damage) = 0.7;
-    };
-    class CUP_launch_MAAWS_Scope: CUP_launch_MAAWS {};
-    class CUP_launch_Metis: Launcher_Base_F {
-        EGVAR(overpressure,angle) = 45;
-        EGVAR(overpressure,range) = 30;
-        EGVAR(overpressure,damage) = 0.5;
-    };
-    class CUP_launch_RPG7V: Launcher_Base_F {
-        EGVAR(overpressure,angle) = 45;
-        EGVAR(overpressure,range) = 20;
-        EGVAR(overpressure,damage) = 1;
-    };
-    class CUP_launch_Mk153Mod0: Launcher_Base_F {
-        EGVAR(overpressure,angle) = 30;
-        EGVAR(overpressure,range) = 30;
-        EGVAR(overpressure,damage) = 1;
-    };
-    class CUP_launch_Mk153Mod0_SMAWOptics: CUP_launch_Mk153Mod0 {};
-    class CUP_launch_FIM92Stinger: Launcher_Base_F {
-        EGVAR(overpressure,angle) = 45;
-        EGVAR(overpressure,range) = 15;
-        EGVAR(overpressure,damage) = 0.3; // Main damage arises from debris rather than the actual backblast
-    };
-    class CUP_launch_9K32Strela: Launcher_Base_F {
-        EGVAR(overpressure,angle) = 30;
-        EGVAR(overpressure,range) = 2;
-        EGVAR(overpressure,damage) = 0.5;
-    };
-    // Disposable launchers under this line
-    class CUP_launch_M136: Launcher_Base_F {
-        EGVAR(overpressure,angle) = 45;
-        EGVAR(overpressure,range) = 100;
-        EGVAR(overpressure,damage) = 0.7;
-        ACE_UsedTube = "ACE_launch_M136_Used_F";      // The class name of the used tube.
-        magazines[] = {"ACE_PreloadedMissileDummy_CUP"};  // The dummy magazine
-    };
-    class ACE_launch_M136_Used_F: CUP_launch_M136 {
-        scope = 1;
-        ACE_isUsedLauncher = 1;
-        author = "$STR_ACE_Common_ACETeam";
-        //displayName = "$STR_ACE_Disposable_UsedTube";
-        //descriptionShort = "$STR_ACE_Disposable_UsedTubeDescription";
-        displayName = "M136 (Used)";
-        descriptionShort = "Used M136 Tube";
-        magazines[] = {"ACE_FiredMissileDummy_CUP"};
-        //picture = "";              @todo
-        //model = "";                @todo
-        weaponPoolAvailable = 0;
-    };
-    class CUP_launch_NLAW: Launcher_Base_F {
-        EGVAR(overpressure,angle) = 30;
-        EGVAR(overpressure,range) = 2;
-        EGVAR(overpressure,damage) = 0.5;
-        ACE_UsedTube = "ACE_launch_NLAW_Used_F";      // The class name of the used tube.
-        magazines[] = {"ACE_PreloadedMissileDummy_CUP"};  // The dummy magazine
-    };
-    class ACE_launch_NLAW_Used_F: CUP_launch_NLAW {
-        scope = 1;
-        ACE_isUsedLauncher = 1;
-        author = "$STR_ACE_Common_ACETeam";
-        //displayName = "$STR_ACE_Disposable_UsedTube";
-        //descriptionShort = "$STR_ACE_Disposable_UsedTubeDescription";
-        displayName = "NLAW (Used)";
-        descriptionShort = "Used NLAW Tube";
-        magazines[] = {"ACE_FiredMissileDummy_CUP"};
-        //picture = "";              @todo
-        //model = "";                @todo
-        weaponPoolAvailable = 0;
-    };
-    class CUP_launch_RPG18: Launcher_Base_F {
-        EGVAR(overpressure,angle) = 40;
-        EGVAR(overpressure,range) = 15;
-        EGVAR(overpressure,damage) = 1;
-        ACE_UsedTube = "ACE_launch_RPG18_Used_F";      // The class name of the used tube.
-        magazines[] = {"ACE_PreloadedMissileDummy_CUP"};  // The dummy magazine
-    };
-    class ACE_launch_RPG18_Used_F: CUP_launch_RPG18 {
-        scope = 1;
-        ACE_isUsedLauncher = 1;
-        author = "$STR_ACE_Common_ACETeam";
-        //displayName = "$STR_ACE_Disposable_UsedTube";
-        //descriptionShort = "$STR_ACE_Disposable_UsedTubeDescription";
-        displayName = "RPG18 (Used)";
-        descriptionShort = "Used RPG18 Tube";
-        magazines[] = {"ACE_FiredMissileDummy_CUP"};
-        //picture = "";              @todo
-        //model = "";                @todo
-        weaponPoolAvailable = 0;
-    };
-};
\ No newline at end of file
diff --git a/optionals/compat_cup/config.cpp b/optionals/compat_cup/config.cpp
deleted file mode 100644
index 20ae5d6911..0000000000
--- a/optionals/compat_cup/config.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-#include "script_component.hpp"
-
-class CfgPatches {
-    class ADDON {
-        units[] = {};
-        weapons[] = {};
-        requiredVersion = REQUIRED_VERSION;
-        requiredAddons[] = {"CUP_Weapons_Ammunition"};
-        author[]={"Ruthberg"};
-        VERSION_CONFIG;
-    };
-};
-
-#include "CfgWeapons.hpp"
-#include "CfgMagazines.hpp"
\ No newline at end of file
diff --git a/optionals/compat_cup/script_component.hpp b/optionals/compat_cup/script_component.hpp
deleted file mode 100644
index 3d77fcb370..0000000000
--- a/optionals/compat_cup/script_component.hpp
+++ /dev/null
@@ -1,5 +0,0 @@
-#define COMPONENT CUP_Weapons_Ammunition_comp
-
-#include "\z\ace\addons\main\script_mod.hpp"
-
-#include "\z\ace\addons\main\script_macros.hpp"