diff --git a/src/menu/ncc/Item.cpp b/src/menu/ncc/Item.cpp
index a8dd7bee..5864cb89 100755
--- a/src/menu/ncc/Item.cpp
+++ b/src/menu/ncc/Item.cpp
@@ -9,7 +9,6 @@
 #include "menu/ncc/Menu.hpp"
 
 #include "common.hpp"
-#if TEXTMODE_VAC != 1
 namespace menu
 {
 namespace ncc
@@ -49,4 +48,3 @@ void Item::HandleCustomEvent(KeyValues *event)
 }
 }
 }
-#endif
diff --git a/src/menu/ncc/ItemSublist.cpp b/src/menu/ncc/ItemSublist.cpp
index 12e5f2a0..f3e269ff 100755
--- a/src/menu/ncc/ItemSublist.cpp
+++ b/src/menu/ncc/ItemSublist.cpp
@@ -9,7 +9,6 @@
 #include "menu/ncc/Menu.hpp"
 
 #include "common.hpp"
-#if TEXTMODE_VAC != 1
 namespace menu
 {
 namespace ncc
@@ -97,4 +96,3 @@ void ItemSublist::OnMouseLeave()
 }
 }
 }
-#endif
diff --git a/src/menu/ncc/ItemTitle.cpp b/src/menu/ncc/ItemTitle.cpp
index 3fde459e..b8ae6ce4 100755
--- a/src/menu/ncc/ItemTitle.cpp
+++ b/src/menu/ncc/ItemTitle.cpp
@@ -9,7 +9,6 @@
 #include "menu/ncc/Menu.hpp"
 
 #include "common.hpp"
-#if TEXTMODE_VAC != 1
 namespace menu
 {
 namespace ncc
@@ -32,4 +31,3 @@ void ItemTitle::Draw(int x, int y)
 }
 }
 }
-#endif
diff --git a/src/menu/ncc/ItemVariable.cpp b/src/menu/ncc/ItemVariable.cpp
index 4d6a5093..190ae653 100644
--- a/src/menu/ncc/ItemVariable.cpp
+++ b/src/menu/ncc/ItemVariable.cpp
@@ -10,7 +10,6 @@
 #include "menu/ncc/Menu.hpp"
 #include "common.hpp"
 
-#if TEXTMODE_VAC != 1
 namespace menu
 {
 namespace ncc
@@ -245,4 +244,3 @@ void ItemVariable::Draw(int x, int y)
 }
 }
 }
-#endif
diff --git a/src/menu/ncc/List.cpp b/src/menu/ncc/List.cpp
index 6a5c23b6..deccf5b5 100755
--- a/src/menu/ncc/List.cpp
+++ b/src/menu/ncc/List.cpp
@@ -13,7 +13,6 @@
 #include "menu/ncc/ItemSublist.hpp"
 
 #include "common.hpp"
-#if TEXTMODE_VAC != 1
 namespace menu
 {
 namespace ncc
@@ -347,4 +346,3 @@ void List::MoveChildren()
 }
 }
 }
-#endif
diff --git a/src/menu/ncc/Menu.cpp b/src/menu/ncc/Menu.cpp
index 3c644f27..9d26dd5b 100644
--- a/src/menu/ncc/Menu.cpp
+++ b/src/menu/ncc/Menu.cpp
@@ -12,7 +12,6 @@
 #include "menu/ncc/ItemSublist.hpp"
 #include "menu/ncc/Tooltip.hpp"
 
-#if TEXTMODE_VAC != 1
 namespace menu
 {
 namespace ncc
@@ -783,4 +782,3 @@ List &MainList()
 }
 }
 }
-#endif
diff --git a/src/menu/ncc/PlayerList.cpp b/src/menu/ncc/PlayerList.cpp
index 7b779ea3..2419f50e 100755
--- a/src/menu/ncc/PlayerList.cpp
+++ b/src/menu/ncc/PlayerList.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "menu/ncc/Menu.hpp"
-#if TEXTMODE_VAC != 1
 namespace menu
 {
 namespace ncc
@@ -91,4 +90,3 @@ void PlayerList::MoveChildren()
 }
 }
 }
-#endif
diff --git a/src/menu/ncc/PlayerListEntry.cpp b/src/menu/ncc/PlayerListEntry.cpp
index 1660e5d8..28f265e8 100755
--- a/src/menu/ncc/PlayerListEntry.cpp
+++ b/src/menu/ncc/PlayerListEntry.cpp
@@ -7,7 +7,6 @@
 
 #include "menu/ncc/PlayerListEntry.hpp"
 #include "helpers.hpp"
-#if TEXTMODE_VAC != 1
 namespace menu
 {
 namespace ncc
@@ -307,4 +306,3 @@ void SubState::OnKeyPress(ButtonCode_t key, bool repeat)
 }
 }
 }
-#endif
diff --git a/src/menu/ncc/Root.cpp b/src/menu/ncc/Root.cpp
index 8f31622e..09ab8d4a 100755
--- a/src/menu/ncc/Root.cpp
+++ b/src/menu/ncc/Root.cpp
@@ -9,7 +9,6 @@
 #include "menu/ncc/Menu.hpp"
 #include "menu/ncc/Tooltip.hpp"
 #include "common.hpp"
-#if TEXTMODE_VAC != 1
 namespace menu
 {
 namespace ncc
@@ -57,4 +56,3 @@ void Root::OnKeyPress(ButtonCode_t key, bool repeat)
 }
 }
 }
-#endif
diff --git a/src/menu/ncc/Tooltip.cpp b/src/menu/ncc/Tooltip.cpp
index 69d87f4c..7c0264ca 100755
--- a/src/menu/ncc/Tooltip.cpp
+++ b/src/menu/ncc/Tooltip.cpp
@@ -9,7 +9,6 @@
 #include "menu/CTextLabel.h"
 #include "common.hpp"
 #include "GUI.h"
-#if TEXTMODE_VAC != 1
 namespace menu
 {
 namespace ncc
@@ -57,4 +56,3 @@ void Tooltip::Draw(int x, int y)
 }
 }
 }
-#endif
diff --git a/src/sdk/convar.cpp b/src/sdk/convar.cpp
index f749880d..16c61ad0 100755
--- a/src/sdk/convar.cpp
+++ b/src/sdk/convar.cpp
@@ -29,7 +29,6 @@
 #define ALLOW_DEVELOPMENT_CVARS
 #endif
 
-#define Q_snprintf snprintf
 #include <logging.hpp>
 #include <interfaces.hpp>
 
diff --git a/src/visual/atlas.cpp b/src/visual/atlas.cpp
index 974e40ec..d808d824 100755
--- a/src/visual/atlas.cpp
+++ b/src/visual/atlas.cpp
@@ -5,8 +5,6 @@
  *      Author: nullifiedcat
  */
 
-#if ENABLE_VISUALS == 1
-
 #include "common.hpp"
 
 namespace textures
@@ -42,5 +40,3 @@ texture_atlas &atlas()
     return object;
 }
 }
-
-#endif
diff --git a/src/visual/drawing.cpp b/src/visual/drawing.cpp
index 119a148c..7918fc7a 100755
--- a/src/visual/drawing.cpp
+++ b/src/visual/drawing.cpp
@@ -5,8 +5,6 @@
  *      Author: nullifiedcat
  */
 
-#if ENABLE_VISUALS == 1
-
 #include "common.hpp"
 
 #include <GL/gl.h>
@@ -134,5 +132,3 @@ bool draw::WorldToScreen(const Vector &origin, Vector &screen)
     }
     return false;
 }
-
-#endif
diff --git a/src/visual/drawmgr.cpp b/src/visual/drawmgr.cpp
index 6a50cd45..98853595 100644
--- a/src/visual/drawmgr.cpp
+++ b/src/visual/drawmgr.cpp
@@ -27,9 +27,9 @@ void render_cheat_visuals()
 
 void BeginCheatVisuals()
 {
-#if RENDERING_ENGINE_OPENGL
+/*#if RENDERING_ENGINE_OPENGL
     std::lock_guard<std::mutex> draw_lock(drawing_mutex);
-#endif
+#endif*/
     draw_api::draw_begin();
     ResetStrings();
 }
@@ -45,9 +45,9 @@ CatVar enable_logo(CV_SWITCH, "nullcore_mode_logo", "1",
 
 void DrawCheatVisuals()
 {
-#if RENDERING_ENGINE_OPENGL
+/*#if RENDERING_ENGINE_OPENGL
     std::lock_guard<std::mutex> draw_lock(drawing_mutex);
-#endif
+#endif*/
     {
         PROF_SECTION(DRAW_misc);
         hacks::shared::misc::DrawText();