diff --git a/benchmark/build.gradle b/benchmark/build.gradle
index 974cb0753b..7cda2f1460 100644
--- a/benchmark/build.gradle
+++ b/benchmark/build.gradle
@@ -321,14 +321,14 @@ model {
                 }
             }
         }
-        installAthena(Task) {
+        installSystemcore(Task) {
             $.binaries.each {
                 if (it in NativeExecutableBinarySpec && it.targetPlatform.name == nativeUtils.wpi.platforms.systemcore && it.component.name == 'benchmarkCpp') {
                     dependsOn it.tasks.install
                 }
             }
         }
-        installAthenaStatic(Task) {
+        installSystemcoreStatic(Task) {
             $.binaries.each {
                 if (it in NativeExecutableBinarySpec && it.targetPlatform.name == nativeUtils.wpi.platforms.systemcore && it.component.name == 'benchmarkCppStatic') {
                     dependsOn it.tasks.install
diff --git a/commandsv2/CommandsV2.json b/commandsv2/CommandsV2.json
index 8358b098ec..0daff74ac9 100644
--- a/commandsv2/CommandsV2.json
+++ b/commandsv2/CommandsV2.json
@@ -33,11 +33,9 @@
       "skipInvalidPlatforms": true,
       "binaryPlatforms": [
         "linuxsystemcore",
-        "linuxathena",
-        "linuxarm32",
         "linuxarm64",
         "windowsx86-64",
-        "windowsx86",
+        "windowsarm64",
         "linuxx86-64",
         "osxuniversal"
       ]
diff --git a/cscore/build.gradle b/cscore/build.gradle
index 3fe57ffe80..3dc5380cd8 100644
--- a/cscore/build.gradle
+++ b/cscore/build.gradle
@@ -172,7 +172,7 @@ model {
     components {
         examplesMap.each { key, value ->
             if (key == "usbviewer") {
-                if (!project.hasProperty('onlylinuxathena') && !project.hasProperty('onlylinuxsystemcore')) {
+                if (!project.hasProperty('onlylinuxsystemcore')) {
                     "${key}"(NativeExecutableSpec) {
                         targetBuildTypes 'debug'
                         binaries.all {
diff --git a/fields/build.gradle b/fields/build.gradle
index 7237d6c21a..0bf5f4f56b 100644
--- a/fields/build.gradle
+++ b/fields/build.gradle
@@ -1,6 +1,6 @@
 import org.gradle.internal.os.OperatingSystem
 
-if (project.hasProperty('onlylinuxathena') || project.hasProperty('onlylinuxsystemcore')) {
+if (project.hasProperty('onlylinuxsystemcore')) {
     return;
 }
 
diff --git a/glass/build.gradle b/glass/build.gradle
index 963d7eae63..cd7ed5f622 100644
--- a/glass/build.gradle
+++ b/glass/build.gradle
@@ -1,6 +1,6 @@
 import org.gradle.internal.os.OperatingSystem
 
-if (project.hasProperty('onlylinuxathena') || project.hasProperty('onlylinuxsystemcore')) {
+if (project.hasProperty('onlylinuxsystemcore')) {
     return;
 }
 
diff --git a/hal/build.gradle b/hal/build.gradle
index 4627405f3d..4d3b0c80d8 100644
--- a/hal/build.gradle
+++ b/hal/build.gradle
@@ -70,10 +70,6 @@ ext {
 sourceSets.main.java.srcDir "${projectDir}/src/generated/main/java"
 
 cppSourcesZip {
-    from('src/main/native/athena') {
-        into '/athena'
-    }
-
     from('src/main/native/systemcore') {
         into '/systemcore'
     }
diff --git a/shared/java/javacommon.gradle b/shared/java/javacommon.gradle
index 366c6c9ce5..1dffe0622c 100644
--- a/shared/java/javacommon.gradle
+++ b/shared/java/javacommon.gradle
@@ -84,7 +84,7 @@ test {
     finalizedBy jacocoTestReport
 }
 
-if (project.hasProperty('onlylinuxathena') || project.hasProperty('onlylinuxsystemcore') || project.hasProperty('onlylinuxarm32') || project.hasProperty('onlylinuxarm64') || project.hasProperty('onlywindowsarm64')) {
+if (project.hasProperty('onlylinuxsystemcore') || project.hasProperty('onlylinuxarm32') || project.hasProperty('onlylinuxarm64') || project.hasProperty('onlywindowsarm64')) {
     test.enabled = false
 }
 
diff --git a/shared/plugins/setupBuild.gradle b/shared/plugins/setupBuild.gradle
index a6508d75cd..2ea165a9b2 100644
--- a/shared/plugins/setupBuild.gradle
+++ b/shared/plugins/setupBuild.gradle
@@ -2,8 +2,7 @@ apply plugin: 'cpp'
 apply plugin: 'org.wpilib.NativeUtils'
 apply plugin: ExtraTasks
 
-if (!project.hasProperty('onlylinuxathena') && !project.hasProperty('onlylinuxsystemcore')) {
-    ext.skiplinuxathena = true
+if (!project.hasProperty('onlylinuxsystemcore')) {
     ext.skiplinuxsystemcore = true
     apply from: "${rootDir}/shared/config.gradle"
 
@@ -58,7 +57,7 @@ if (!project.hasProperty('onlylinuxathena') && !project.hasProperty('onlylinuxsy
                     }
                 }
                 binaries.all {
-                    if (!project.hasProperty('onlylinuxathena')  && !project.hasProperty('onlylinuxsystemcore')) {
+                    if (!project.hasProperty('onlylinuxsystemcore')) {
                         project(':hal').addHalDependency(it, 'shared')
                         lib library: pluginName
                         if (project.hasProperty('includeNtCore')) {
@@ -82,7 +81,7 @@ if (!project.hasProperty('onlylinuxathena') && !project.hasProperty('onlylinuxsy
 model {
     tasks {
         def c = $.components
-        if (!project.hasProperty('onlylinuxathena') && !project.hasProperty('onlylinuxsystemcore')) {
+        if (!project.hasProperty('onlylinuxsystemcore')) {
             project.tasks.create('runCpp', Exec) {
                 group = 'WPILib'
                 description = "Run the ${pluginName}Dev executable"
diff --git a/simulation/halsim_ds_socket/build.gradle b/simulation/halsim_ds_socket/build.gradle
index 7e2f4e2abb..c2faf1dc8a 100644
--- a/simulation/halsim_ds_socket/build.gradle
+++ b/simulation/halsim_ds_socket/build.gradle
@@ -1,4 +1,4 @@
-if (project.hasProperty('onlylinuxathena') || project.hasProperty('onlylinuxsystemcore')) {
+if (project.hasProperty('onlylinuxsystemcore')) {
     return;
 }
 
diff --git a/simulation/halsim_gui/build.gradle b/simulation/halsim_gui/build.gradle
index 1e8f231bff..abfd117165 100644
--- a/simulation/halsim_gui/build.gradle
+++ b/simulation/halsim_gui/build.gradle
@@ -1,4 +1,4 @@
-if (project.hasProperty('onlylinuxathena') || project.hasProperty('onlylinuxsystemcore')) {
+if (project.hasProperty('onlylinuxsystemcore')) {
     return;
 }
 
diff --git a/simulation/halsim_ws_client/build.gradle b/simulation/halsim_ws_client/build.gradle
index f03f1420d2..c56c2cfc27 100644
--- a/simulation/halsim_ws_client/build.gradle
+++ b/simulation/halsim_ws_client/build.gradle
@@ -1,4 +1,4 @@
-if (project.hasProperty('onlylinuxathena') || project.hasProperty('onlylinuxsystemcore')) {
+if (project.hasProperty('onlylinuxsystemcore')) {
     return;
 }
 
diff --git a/simulation/halsim_ws_core/build.gradle b/simulation/halsim_ws_core/build.gradle
index 49157bfd3e..7d5b93212a 100644
--- a/simulation/halsim_ws_core/build.gradle
+++ b/simulation/halsim_ws_core/build.gradle
@@ -1,4 +1,4 @@
-if (project.hasProperty('onlylinuxathena') || project.hasProperty('onlylinuxsystemcore')) {
+if (project.hasProperty('onlylinuxsystemcore')) {
     return;
 }
 
diff --git a/simulation/halsim_ws_server/build.gradle b/simulation/halsim_ws_server/build.gradle
index 561c4afe3c..9b2c8b435f 100644
--- a/simulation/halsim_ws_server/build.gradle
+++ b/simulation/halsim_ws_server/build.gradle
@@ -1,4 +1,4 @@
-if (project.hasProperty('onlylinuxathena') || project.hasProperty('onlylinuxsystemcore')) {
+if (project.hasProperty('onlylinuxsystemcore')) {
     return;
 }
 
diff --git a/simulation/halsim_xrp/build.gradle b/simulation/halsim_xrp/build.gradle
index 12d6465047..d177a098a1 100644
--- a/simulation/halsim_xrp/build.gradle
+++ b/simulation/halsim_xrp/build.gradle
@@ -1,4 +1,4 @@
-if (project.hasProperty('onlylinuxathena') || project.hasProperty('onlylinuxsystemcore')) {
+if (project.hasProperty('onlylinuxsystemcore')) {
     return;
 }
 
diff --git a/thirdparty/imgui_suite/build.gradle b/thirdparty/imgui_suite/build.gradle
index 7986fade72..34fd32ac2b 100644
--- a/thirdparty/imgui_suite/build.gradle
+++ b/thirdparty/imgui_suite/build.gradle
@@ -1,6 +1,6 @@
 import org.gradle.internal.os.OperatingSystem
 
-if (project.hasProperty('onlylinuxathena') || project.hasProperty('onlylinuxsystemcore')) {
+if (project.hasProperty('onlylinuxsystemcore')) {
     return;
 }
 
diff --git a/tools/datalogtool/build.gradle b/tools/datalogtool/build.gradle
index a51883640e..6c1478eeb2 100644
--- a/tools/datalogtool/build.gradle
+++ b/tools/datalogtool/build.gradle
@@ -1,6 +1,6 @@
 import org.gradle.internal.os.OperatingSystem
 
-if (project.hasProperty('onlylinuxathena') || project.hasProperty('onlylinuxsystemcore')) {
+if (project.hasProperty('onlylinuxsystemcore')) {
     return;
 }
 
diff --git a/tools/outlineviewer/build.gradle b/tools/outlineviewer/build.gradle
index ac3cd899e3..f9dd5b27f1 100644
--- a/tools/outlineviewer/build.gradle
+++ b/tools/outlineviewer/build.gradle
@@ -1,6 +1,6 @@
 import org.gradle.internal.os.OperatingSystem
 
-if (project.hasProperty('onlylinuxathena') || project.hasProperty('onlylinuxsystemcore')) {
+if (project.hasProperty('onlylinuxsystemcore')) {
     return;
 }
 
diff --git a/tools/processstarter/build.gradle b/tools/processstarter/build.gradle
index a2d7dc6789..5b033eb215 100644
--- a/tools/processstarter/build.gradle
+++ b/tools/processstarter/build.gradle
@@ -1,6 +1,6 @@
 import org.gradle.internal.os.OperatingSystem
 
-if (project.hasProperty('onlylinuxathena') || project.hasProperty('onlylinuxsystemcore')) {
+if (project.hasProperty('onlylinuxsystemcore')) {
     return;
 }
 
diff --git a/tools/sysid/build.gradle b/tools/sysid/build.gradle
index 126039b7fb..b844fbd945 100644
--- a/tools/sysid/build.gradle
+++ b/tools/sysid/build.gradle
@@ -1,6 +1,6 @@
 import org.gradle.internal.os.OperatingSystem
 
-if (project.hasProperty('onlylinuxathena') || project.hasProperty('onlylinuxsystemcore')) {
+if (project.hasProperty('onlylinuxsystemcore')) {
     return;
 }
 
diff --git a/wpigui/build.gradle b/wpigui/build.gradle
index 7c43619b2e..bdba05c545 100644
--- a/wpigui/build.gradle
+++ b/wpigui/build.gradle
@@ -1,6 +1,6 @@
 import org.gradle.internal.os.OperatingSystem
 
-if (project.hasProperty('onlylinuxathena') || project.hasProperty('onlylinuxsystemcore')) {
+if (project.hasProperty('onlylinuxsystemcore')) {
     return;
 }
 
diff --git a/wpilibjExamples/build.gradle b/wpilibjExamples/build.gradle
index fec10b45ad..a87abbe660 100644
--- a/wpilibjExamples/build.gradle
+++ b/wpilibjExamples/build.gradle
@@ -226,7 +226,7 @@ model {
                                     }
                                     testTask.systemProperty 'java.library.path', filePath
 
-                                    if (project.hasProperty('onlylinuxathena') || project.hasProperty('onlylinuxsystemcore') || project.hasProperty('onlylinuxarm32') || project.hasProperty('onlylinuxarm64') || project.hasProperty('onlywindowsarm64')) {
+                                    if (project.hasProperty('onlylinuxsystemcore') || project.hasProperty('onlylinuxarm32') || project.hasProperty('onlylinuxarm64') || project.hasProperty('onlywindowsarm64')) {
                                         testTask.enabled = false
                                     }
                                     test.dependsOn(testTask)
@@ -270,7 +270,7 @@ model {
                                     }
                                     testTask.systemProperty 'java.library.path', filePath
 
-                                    if (project.hasProperty('onlylinuxathena') || project.hasProperty('onlylinuxarm32') || project.hasProperty('onlylinuxarm64') || project.hasProperty('onlywindowsarm64')) {
+                                    if (project.hasProperty('onlylinuxarm32') || project.hasProperty('onlylinuxarm64') || project.hasProperty('onlywindowsarm64')) {
                                         testTask.enabled = false
                                     }
                                     test.dependsOn(testTask)