diff --git a/src/DebugServer/Gdb/Connection.cpp b/src/DebugServer/Gdb/Connection.cpp
index 1aee5b08..f8c1b3c8 100644
--- a/src/DebugServer/Gdb/Connection.cpp
+++ b/src/DebugServer/Gdb/Connection.cpp
@@ -32,7 +32,7 @@ namespace Bloom::DebugServer::Gdb
 
         this->epollInstance.addEntry(
             this->socketFileDescriptor.value(),
-            static_cast<std::uint16_t>(EpollEvent::READ_READY)
+            static_cast<std::uint16_t>(::EPOLL_EVENTS::EPOLLIN)
         );
         this->enableReadInterrupts();
     }
@@ -264,7 +264,7 @@ namespace Bloom::DebugServer::Gdb
     void Connection::enableReadInterrupts() {
         this->epollInstance.addEntry(
             this->interruptEventNotifier.getFileDescriptor(),
-            static_cast<std::uint16_t>(EpollEvent::READ_READY)
+            static_cast<std::uint16_t>(::EPOLL_EVENTS::EPOLLIN)
         );
 
         this->readInterruptEnabled = true;
diff --git a/src/DebugServer/Gdb/GdbRspDebugServer.cpp b/src/DebugServer/Gdb/GdbRspDebugServer.cpp
index caa62934..ed3181a9 100644
--- a/src/DebugServer/Gdb/GdbRspDebugServer.cpp
+++ b/src/DebugServer/Gdb/GdbRspDebugServer.cpp
@@ -106,12 +106,12 @@ namespace Bloom::DebugServer::Gdb
 
         this->epollInstance.addEntry(
             this->serverSocketFileDescriptor.value(),
-            static_cast<std::uint16_t>(EpollEvent::READ_READY)
+            static_cast<std::uint16_t>(::EPOLL_EVENTS::EPOLLIN)
         );
 
         this->epollInstance.addEntry(
             this->interruptEventNotifier.getFileDescriptor(),
-            static_cast<std::uint16_t>(EpollEvent::READ_READY)
+            static_cast<std::uint16_t>(::EPOLL_EVENTS::EPOLLIN)
         );
 
         Logger::info("GDB RSP address: " + this->debugServerConfig.listeningAddress);
diff --git a/src/Helpers/EpollInstance.hpp b/src/Helpers/EpollInstance.hpp
index 1712ae93..e8b3226f 100644
--- a/src/Helpers/EpollInstance.hpp
+++ b/src/Helpers/EpollInstance.hpp
@@ -7,14 +7,8 @@
 
 namespace Bloom
 {
-    enum class EpollEvent: std::uint16_t
-    {
-        READ_READY = EPOLL_EVENTS::EPOLLIN,
-        WRITE_READY = EPOLL_EVENTS::EPOLLOUT,
-    };
-
     /**
-     * The EpollInstance class is an RAII wrapper for a single Linux epoll instance.
+     * RAII wrapper for an epoll instance.
      *
      * See https://man7.org/linux/man-pages/man7/epoll.7.html for more on the Linux epoll API.
      */
diff --git a/src/Helpers/EventFdNotifier.hpp b/src/Helpers/EventFdNotifier.hpp
index 684a76d7..f691cb76 100644
--- a/src/Helpers/EventFdNotifier.hpp
+++ b/src/Helpers/EventFdNotifier.hpp
@@ -7,9 +7,7 @@
 namespace Bloom
 {
     /**
-     * The EventFdNotifier class is an RAII wrapper for a Linux eventfd object.
-     *
-     * It uses an eventfd object to implement the NotifierInterface.
+     * RAII wrapper for a Linux eventfd object, used to implement the NotifierInterface.
      */
     class EventFdNotifier: public NotifierInterface
     {