diff --git a/src/d/d_map.cpp b/src/d/d_map.cpp
index 76289d52dd..a0ee8d8128 100644
--- a/src/d/d_map.cpp
+++ b/src/d/d_map.cpp
@@ -341,7 +341,6 @@ inline u8 twoValueLineInterpolation(u8 param_0, u8 param_1, f32 param_2) {
 }
 
 void renderingAmap_c::draw() {
-    #if REQUIRES_GX_LINES
     f32 tmp = ((f32)(g_Counter.mCounter0 % dMap_HIO_prm_res_dst_s::m_res->field_0x1aa) /
                (f32)dMap_HIO_prm_res_dst_s::m_res->field_0x1aa);
     tmp = tmp;
@@ -377,7 +376,6 @@ void renderingAmap_c::draw() {
     setAmapPaletteColor(0x2E, temp_r31, temp_r30, temp_r29, temp_r28);
 
     renderingDAmap_c::draw();
-    #endif
 }
 
 int renderingAmap_c::getDispType() const {
diff --git a/src/d/d_map_path.cpp b/src/d/d_map_path.cpp
index 47f0f1e43c..acc29ae1d3 100644
--- a/src/d/d_map_path.cpp
+++ b/src/d/d_map_path.cpp
@@ -346,13 +346,11 @@ void dRenderingMap_c::makeResTIMG(ResTIMG* p_image, u16 width, u16 height, u8* p
 void dRenderingMap_c::renderingMap() {
     preRenderingMap();
     if (isDrawPath()) {
-        #if REQUIRES_GX_LINES
         preDrawPath();
         beforeDrawPath();
         drawPath();
         afterDrawPath();
         postDrawPath();
-        #endif
     }
     postRenderingMap();
 }
@@ -473,7 +471,6 @@ void dRenderingFDAmap_c::renderingDecoration(dDrawPath_c::line_class const* p_li
     GXSetTevColor(GX_TEVREG1, lineColor);
 
     for (int i = 0; i < data_num; i++) {
-#if REQUIRES_GX_LINES
 #ifndef HYRULE_FIELD_SPEEDHACK
         if (i < data_num - 1) {
             GXSetTevColorIn(GX_TEVSTAGE0, GX_CC_ZERO, GX_CC_ZERO, GX_CC_ZERO, GX_CC_C0);
@@ -494,11 +491,14 @@ void dRenderingFDAmap_c::renderingDecoration(dDrawPath_c::line_class const* p_li
         GXSetTevAlphaIn(GX_TEVSTAGE0, GX_CA_ZERO, GX_CA_ZERO, GX_CA_ZERO, GX_CA_TEXA);
         GXSetTevAlphaOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV);
 #endif
-#endif
+
+        // aurora doesn't support GX_POINTS yet
+        #if !TARGET_PC
         GXBegin(GX_POINTS, GX_VTXFMT0, 1);
         GXPosition1x16(data_p[0]);
         GXTexCoord2f32(0, 0);
         GXEnd();
+        #endif
         data_p++;
     }
 
diff --git a/src/d/d_map_path_dmap.cpp b/src/d/d_map_path_dmap.cpp
index cd76155327..f53b253eb8 100644
--- a/src/d/d_map_path_dmap.cpp
+++ b/src/d/d_map_path_dmap.cpp
@@ -617,10 +617,7 @@ bool renderingDAmap_c::isSwitch(dDrawPath_c::group_class const* i_group) {
 }
 
 void renderingDAmap_c::draw() {
-#if !TARGET_PC
-    // Currently breaks Aurora.
     renderingMap();
-#endif
     mIsDraw = true;
 }
 
diff --git a/src/d/d_menu_ring.cpp b/src/d/d_menu_ring.cpp
index cad04d6ab6..3949adffed 100644
--- a/src/d/d_menu_ring.cpp
+++ b/src/d/d_menu_ring.cpp
@@ -1262,10 +1262,8 @@ void dMenu_Ring_c::drawItem() {
         (g_ringHIO.mItemAlphaMin + fVar16 * (g_ringHIO.mItemAlphaMax - g_ringHIO.mItemAlphaMin));
     for (int i = 0; i < mItemsTotal; i++) {
         if (i != mCurrentSlot || (mStatus != STATUS_WAIT && mStatus != STATUS_EXPLAIN && mStatus != STATUS_EXPLAIN_FORCE)) {
-            #if REQUIRES_GX_LINES
             J2DDrawFrame(mItemSlotPosX[i] - 24.0f + mCenterPosX, mItemSlotPosY[i] - 24.0f + mCenterPosY,
                          48.0f, 48.0f, g_ringHIO.mItemFrame[g_ringHIO.UNSELECT_FRAME], 6);
-            #endif
             f32 fVar17 = 1.0f;
             if (i != mCurrentSlot) {
                 fVar17 = ringAlpha / 255.0f;
@@ -1308,10 +1306,8 @@ void dMenu_Ring_c::drawItem() {
 void dMenu_Ring_c::drawItem2() {
     s32 idx = mCurrentSlot;
     if (mStatus == STATUS_WAIT || mStatus == STATUS_EXPLAIN || mStatus == STATUS_EXPLAIN_FORCE) {
-        #if REQUIRES_GX_LINES
         J2DDrawFrame(mItemSlotPosX[idx] - 24.0f + mCenterPosX, mItemSlotPosY[idx] - 24.0f + mCenterPosY,
                      48.0f, 48.0f, g_ringHIO.mItemFrame[g_ringHIO.SELECT_FRAME], 6);
-        #endif
 
         for (int i = 0; i < 3; i++) {
             if (mpItemTex[idx][i] != NULL) {
diff --git a/src/dusk/imgui/ImGuiMenuTools.cpp b/src/dusk/imgui/ImGuiMenuTools.cpp
index e77941af52..e2537a264a 100644
--- a/src/dusk/imgui/ImGuiMenuTools.cpp
+++ b/src/dusk/imgui/ImGuiMenuTools.cpp
@@ -25,8 +25,7 @@ namespace dusk {
 
             if (ImGui::BeginMenu("Collision View")) {
                 ImGui::Checkbox("Enable Terrain view", &m_collisionViewSettings.m_enableTerrainView);
-                // can't use wireframe atm because aurora doesn't support GX_LINES
-                //ImGui::Checkbox("Enable wireframe view", &m_collisionViewSettings.m_enableWireframe);
+                ImGui::Checkbox("Enable wireframe view", &m_collisionViewSettings.m_enableWireframe);
                 ImGui::SliderFloat("Opacity##terrain", &m_collisionViewSettings.m_terrainViewOpacity, 0.0f, 100.0f);
                 ImGui::SliderFloat("Draw Range", &m_collisionViewSettings.m_drawRange, 0.0f, 1000.0f);
                 ImGui::Separator();
@@ -189,4 +188,4 @@ namespace dusk {
 
         ImGui::End();
     }
-}
\ No newline at end of file
+}
diff --git a/src/m_Do/m_Do_ext.cpp b/src/m_Do/m_Do_ext.cpp
index a7829bdb50..993937f0e3 100644
--- a/src/m_Do/m_Do_ext.cpp
+++ b/src/m_Do/m_Do_ext.cpp
@@ -1738,8 +1738,6 @@ void mDoExt_McaMorfSO::setAnm(J3DAnmTransform* i_anm, int i_attr, f32 i_morf, f3
     setLoopFrame(getFrame());
     setMorf(i_morf);
 
-    STUB_RET();
-
     if (mpSound != NULL) {
         if (i_anm != NULL) {
             mpBas = static_cast<mDoExt_transAnmBas*>(i_anm)->getBas();