diff --git a/include/PSX/Auxiliary/io_class_helper.hpp b/include/PSX/Auxiliary/io_class_helper.hpp
deleted file mode 100644
index 0cbf4371..00000000
--- a/include/PSX/Auxiliary/io_class_helper.hpp
+++ /dev/null
@@ -1,48 +0,0 @@
-#ifndef __JABYENGINE_IO_CLASS_HELPER_HPP__
-#define __JABYENGINE_IO_CLASS_HELPER_HPP__
-#include "bits.hpp"
-
-#define io_class__2option_map(option0, option1, bit_num) \
-        constexpr auto& set_##option0() { \
-            this->raw_value = bit::clear(this->raw_value, bit_num); \
-            return *this;\
-        } \
-        \
-        constexpr auto& set_##option1() { \
-            this->raw_value = bit::set(this->raw_value, bit_num); \
-            return *this; \
-        }
-
-#define io_class__2option_map_getter(type, option0, option1, name, bit_num) \
-    io_class__2option_map(option0, option1, bit_num) \
-    io_class__option_get(type, name, bit_num)
-
-#define io_class__2option_map_getter_is(type, option0, option1, bit_num) \
-    io_class__2option_map(option0, option1, bit_num) \
-    io_class__option_is(type, option1, bit_num)
-
-#define io_class__option_get(type, name, bit_num) \
-        constexpr type get_##name() const { \
-            return static_cast<type>(bit::is_set(this->raw_value, bit_num)); \
-        }
-
-#define io_class__option_is(type, name, bit_num) \
-        constexpr type is_##name() const { \
-            return static_cast<type>(bit::is_set(this->raw_value, bit_num)); \
-        }
-
-template<typename T>
-static constexpr __always_inline void io_class__update_with(T& dst, const T& src) {
-    typedef decltype(dst.raw_value) DST_VALUE;
-
-    const_cast<volatile DST_VALUE&>(dst.raw_value) = src.raw_value;
-}
-
-template<typename T, typename U>
-static constexpr __always_inline void io_class__update_with(T& dst, const U& src) {
-    typedef decltype(dst.raw_value) DST_VALUE;
-
-    const_cast<volatile DST_VALUE&>(dst.raw_value) = src;
-}
-
-#endif //!__JABYENGINE_IO_CLASS_HELPER_HPP__
\ No newline at end of file
diff --git a/include/PSX/System/IOPorts/GPU_IO.hpp b/include/PSX/System/IOPorts/GPU_IO.hpp
new file mode 100644
index 00000000..27236b98
--- /dev/null
+++ b/include/PSX/System/IOPorts/GPU_IO.hpp
@@ -0,0 +1,13 @@
+#ifndef __JABYENGINE_GPU_IO_HPP__
+#define __JABYENGINE_GPU_IO_HPP__
+#include "IOPort.hpp"
+
+namespace GPU {
+    namespace Port {
+        struct __no_align Command : public ComplexBitMap<uint32_t> {
+            
+        };
+    }
+}
+
+#endif //!__JABYENGINE_GPU_IO_HPP__
\ No newline at end of file
diff --git a/include/PSX/System/IOPorts/SPU_IO.hpp b/include/PSX/System/IOPorts/SPU_IO.hpp
index ea4ecf4a..cf5a5db2 100644
--- a/include/PSX/System/IOPorts/SPU_IO.hpp
+++ b/include/PSX/System/IOPorts/SPU_IO.hpp
@@ -1,7 +1,6 @@
 #ifndef __JABYENGINE_SPU_IO_HPP__
 #define __JABYENGINE_SPU_IO_HPP__
 #include "IOPort.hpp"
-#include <limits.h>
 
 namespace SPU {
     namespace Port {