diff --git a/hal/include/HAL/HAL.h b/hal/include/HAL/HAL.h
index 932c268ac3..ca54b03216 100644
--- a/hal/include/HAL/HAL.h
+++ b/hal/include/HAL/HAL.h
@@ -110,7 +110,6 @@ extern const uint32_t kSystemClockTicksPerMicrosecond;
 
 HalPortHandle getPort(uint8_t pin);
 HalPortHandle getPortWithModule(uint8_t module, uint8_t pin);
-void freePort(HalPortHandle port);
 const char* getHALErrorMessage(int32_t code);
 
 uint16_t getFPGAVersion(int32_t* status);
diff --git a/hal/lib/athena/HALAthena.cpp b/hal/lib/athena/HALAthena.cpp
index f7de0e4e83..94265cce0a 100644
--- a/hal/lib/athena/HALAthena.cpp
+++ b/hal/lib/athena/HALAthena.cpp
@@ -54,10 +54,6 @@ HalPortHandle getPortWithModule(uint8_t module, uint8_t pin) {
   return createPortHandle(pin, module);
 }
 
-void freePort(HalPortHandle port_handle) {
-  // noop
-}
-
 const char* getHALErrorMessage(int32_t code) {
   switch (code) {
     case 0:
diff --git a/wpilibc/athena/src/AnalogInput.cpp b/wpilibc/athena/src/AnalogInput.cpp
index 801b29cfa4..1734bf37c8 100644
--- a/wpilibc/athena/src/AnalogInput.cpp
+++ b/wpilibc/athena/src/AnalogInput.cpp
@@ -48,7 +48,6 @@ AnalogInput::AnalogInput(uint32_t channel) {
   int32_t status = 0;
   m_port = initializeAnalogInputPort(port, &status);
   wpi_setErrorWithContext(status, getHALErrorMessage(status));
-  freePort(port);
 
   LiveWindow::GetInstance()->AddSensor("AnalogInput", channel, this);
   HALReport(HALUsageReporting::kResourceType_AnalogChannel, channel);
diff --git a/wpilibc/athena/src/AnalogOutput.cpp b/wpilibc/athena/src/AnalogOutput.cpp
index cb49441eba..006ef4e5aa 100644
--- a/wpilibc/athena/src/AnalogOutput.cpp
+++ b/wpilibc/athena/src/AnalogOutput.cpp
@@ -36,7 +36,6 @@ AnalogOutput::AnalogOutput(uint32_t channel) {
   HalPortHandle port = getPort(m_channel);
   int32_t status = 0;
   m_port = initializeAnalogOutputPort(port, &status);
-  freePort(port);
   if (status != 0) {
     wpi_setErrorWithContext(status, getHALErrorMessage(status));
     m_channel = std::numeric_limits<uint32_t>::max();
diff --git a/wpilibc/athena/src/AnalogTrigger.cpp b/wpilibc/athena/src/AnalogTrigger.cpp
index 51a52879fb..d6b93fa215 100644
--- a/wpilibc/athena/src/AnalogTrigger.cpp
+++ b/wpilibc/athena/src/AnalogTrigger.cpp
@@ -26,7 +26,6 @@ AnalogTrigger::AnalogTrigger(int32_t channel) {
   uint32_t index = 0;
   m_trigger = initializeAnalogTrigger(port, &index, &status);
   wpi_setErrorWithContext(status, getHALErrorMessage(status));
-  freePort(port);
   m_index = index;
 
   HALReport(HALUsageReporting::kResourceType_AnalogTrigger, channel);
diff --git a/wpilibc/athena/src/SensorBase.cpp b/wpilibc/athena/src/SensorBase.cpp
index a8df7f1937..64f9fafaf7 100644
--- a/wpilibc/athena/src/SensorBase.cpp
+++ b/wpilibc/athena/src/SensorBase.cpp
@@ -35,7 +35,6 @@ SensorBase::SensorBase() {
       int32_t status = 0;
       m_digital_ports[i] = initializeDigitalPort(port, &status);
       wpi_setErrorWithContext(status, getHALErrorMessage(status));
-      freePort(port);
     }
 
     for (uint32_t i = 0; i < kRelayChannels; i++) {
@@ -43,7 +42,6 @@ SensorBase::SensorBase() {
       int32_t status = 0;
       m_relay_ports[i] = initializeDigitalPort(port, &status);
       wpi_setErrorWithContext(status, getHALErrorMessage(status));
-      freePort(port);
     }
 
     for (uint32_t i = 0; i < kPwmChannels; i++) {
@@ -51,7 +49,6 @@ SensorBase::SensorBase() {
       int32_t status = 0;
       m_pwm_ports[i] = initializeDigitalPort(port, &status);
       wpi_setErrorWithContext(status, getHALErrorMessage(status));
-      freePort(port);
     }
   }
 }
diff --git a/wpilibc/athena/src/SolenoidBase.cpp b/wpilibc/athena/src/SolenoidBase.cpp
index c1696fcb3e..8679296a0f 100644
--- a/wpilibc/athena/src/SolenoidBase.cpp
+++ b/wpilibc/athena/src/SolenoidBase.cpp
@@ -25,7 +25,6 @@ SolenoidBase::SolenoidBase(uint8_t moduleNumber)
     SolenoidBase::m_ports[moduleNumber][i] =
         initializeSolenoidPort(port, &status);
     wpi_setErrorWithContext(status, getHALErrorMessage(status));
-    freePort(port);
   }
 }
 
diff --git a/wpilibj/src/athena/cpp/lib/JNIWrapper.cpp b/wpilibj/src/athena/cpp/lib/JNIWrapper.cpp
index fed3679d9c..42f183a765 100644
--- a/wpilibj/src/athena/cpp/lib/JNIWrapper.cpp
+++ b/wpilibj/src/athena/cpp/lib/JNIWrapper.cpp
@@ -45,19 +45,4 @@ JNIEXPORT jint JNICALL Java_edu_wpi_first_wpilibj_hal_JNIWrapper_getPort(
   // FILE_LOG(logDEBUG) << "Port Handle = " << port;
   return (jint)port;
 }
-
-/*
- * Class:     edu_wpi_first_wpilibj_hal_JNIWrapper
- * Method:    freePort
- * Signature: (I)V
- */
-JNIEXPORT void JNICALL Java_edu_wpi_first_wpilibj_hal_JNIWrapper_freePort(
-    JNIEnv* env, jclass, jint id) {
-  // FILE_LOG(logDEBUG) << "Calling JNIWrapper getPortWithModlue";
-  // FILE_LOG(logDEBUG) << "Module = " << (jint)module;
-  // FILE_LOG(logDEBUG) << "Pin = " << (jint)pin;
-  freePort((HalPortHandle)id);
-  // FILE_LOG(logDEBUG) << "Port Handle = " << port;
-}
-
 }  // extern "C"
diff --git a/wpilibj/src/athena/java/edu/wpi/first/wpilibj/AnalogOutput.java b/wpilibj/src/athena/java/edu/wpi/first/wpilibj/AnalogOutput.java
index 3b80b7459e..b8478eaa9b 100644
--- a/wpilibj/src/athena/java/edu/wpi/first/wpilibj/AnalogOutput.java
+++ b/wpilibj/src/athena/java/edu/wpi/first/wpilibj/AnalogOutput.java
@@ -37,7 +37,6 @@ public class AnalogOutput extends SensorBase implements LiveWindowSendable {
 
     final int portHandle = AnalogJNI.getPort((byte) channel);
     m_port = AnalogJNI.initializeAnalogOutputPort(portHandle);
-    AnalogJNI.freePort(portHandle);
 
     LiveWindow.addSensor("AnalogOutput", channel, this);
     UsageReporting.report(tResourceType.kResourceType_AnalogOutput, channel);
diff --git a/wpilibj/src/athena/java/edu/wpi/first/wpilibj/hal/JNIWrapper.java b/wpilibj/src/athena/java/edu/wpi/first/wpilibj/hal/JNIWrapper.java
index eda418763a..c228b360c7 100644
--- a/wpilibj/src/athena/java/edu/wpi/first/wpilibj/hal/JNIWrapper.java
+++ b/wpilibj/src/athena/java/edu/wpi/first/wpilibj/hal/JNIWrapper.java
@@ -62,6 +62,4 @@ public class JNIWrapper {
   public static native int getPortWithModule(byte module, byte pin);
 
   public static native int getPort(byte pin);
-
-  public static native void freePort(int halPortHandle);
 }