diff --git a/platform_linux/linux_4ed.cpp b/platform_linux/linux_4ed.cpp
index e4f49e3a..afeacddb 100644
--- a/platform_linux/linux_4ed.cpp
+++ b/platform_linux/linux_4ed.cpp
@@ -1733,7 +1733,10 @@ main(int argc, char **argv){
             b32 keep_running = linuxvars.keep_running;
             
             // NOTE(allen): Application Core Update
-            app.step(&sysfunc, &target, &memory_vars, &linuxvars.input, &result);
+            if (app.step == 0){
+                LOG("app.step == 0 -- skipping\n");
+                app.step(&sysfunc, &target, &memory_vars, &linuxvars.input, &result);
+            }
             
             // NOTE(allen): Finish the Loop
             if (result.perform_kill){
diff --git a/platform_mac/mac_4ed.cpp b/platform_mac/mac_4ed.cpp
index e046b548..05ffb744 100644
--- a/platform_mac/mac_4ed.cpp
+++ b/platform_mac/mac_4ed.cpp
@@ -480,10 +480,6 @@ osx_try_to_close(void){
 external void
 osx_step(void){
     DBG_POINT();
-    if (app.step == 0){
-        LOG("app.step == 0 -- skipping\n");
-        return;
-    }
     
     Application_Step_Result result = {};
     result.mouse_cursor_type = APP_MOUSE_CURSOR_DEFAULT;
@@ -528,8 +524,10 @@ osx_step(void){
     b32 keep_running = osxvars.keep_running;
     
     // NOTE(allen): Application Core Update
-    //Render_Target fixed_target = target;
-    app.step(&sysfunc, &target, &memory_vars, &frame_input, &result);
+    if (app.step == 0){
+        LOG("app.step == 0 -- skipping\n");
+        app.step(&sysfunc, &target, &memory_vars, &frame_input, &result);
+    }
     
     // NOTE(allen): Finish the Loop
     if (result.perform_kill){
@@ -560,28 +558,6 @@ osx_step(void){
 
 external void
 osx_init(){
-    // TODO(allen): Setup GL DEBUG MESSAGE
-#if defined(FRED_INTERNAL) && 0
-    //
-    // OpenGL Init
-    //
-    
-    typedef PFNGLDEBUGMESSAGECALLBACKARBPROC glDebugMessageCallbackProc;
-    
-    GLXLOAD(glDebugMessageCallback);
-    
-    if (glDebugMessageCallback){
-        LOG("Enabling GL Debug Callback\n");
-        glDebugMessageCallback(&LinuxGLDebugCallback, 0);
-        glEnable(GL_DEBUG_OUTPUT);
-    }
-#endif
-    
-    glEnable(GL_TEXTURE_2D);
-    glEnable(GL_SCISSOR_TEST);
-    glEnable(GL_BLEND);
-    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-    
     //
     // System Linkage
     //
diff --git a/platform_win32/win32_4ed.cpp b/platform_win32/win32_4ed.cpp
index a913d097..242128a6 100644
--- a/platform_win32/win32_4ed.cpp
+++ b/platform_win32/win32_4ed.cpp
@@ -1359,7 +1359,10 @@ WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdS
         }
         
         // NOTE(allen): Application Core Update
-        app.step(&sysfunc, &target, &memory_vars, &input, &result);
+        if (app.step == 0){
+            LOG("app.step == 0 -- skipping\n");
+            app.step(&sysfunc, &target, &memory_vars, &input, &result);
+        }
         
         // NOTE(allen): Finish the Loop
         if (result.perform_kill){