diff --git a/account/source/main.c b/account/source/main.c
index ebdd9a3..9bc37b2 100644
--- a/account/source/main.c
+++ b/account/source/main.c
@@ -84,7 +84,6 @@ int main(int argc, char **argv)
 
         gfxFlushBuffers();
         gfxSwapBuffers();
-        gfxWaitForVsync();
     }
 
     gfxExit();
diff --git a/app_controldata/source/main.c b/app_controldata/source/main.c
index b685268..14f455a 100644
--- a/app_controldata/source/main.c
+++ b/app_controldata/source/main.c
@@ -80,7 +80,6 @@ int main(int argc, char **argv)
 
         gfxFlushBuffers();
         gfxSwapBuffers();
-        gfxWaitForVsync();
     }
 
     gfxExit();
diff --git a/audio/echo/source/main.c b/audio/echo/source/main.c
index e34f92c..cd7f490 100644
--- a/audio/echo/source/main.c
+++ b/audio/echo/source/main.c
@@ -132,7 +132,6 @@ int main(int argc, char **argv)
         
         gfxFlushBuffers();
         gfxSwapBuffers();
-        gfxWaitForVsync();
     }
     
     // Stop audio capture.
diff --git a/audio/playtone/source/main.c b/audio/playtone/source/main.c
index f021fb2..5decd4b 100644
--- a/audio/playtone/source/main.c
+++ b/audio/playtone/source/main.c
@@ -187,7 +187,6 @@ int main(int argc, char **argv)
         
         gfxFlushBuffers();
         gfxSwapBuffers();
-        gfxWaitForVsync();
     }
     
     // Stop audio playback.
diff --git a/fs/romfs/source/main.c b/fs/romfs/source/main.c
index e5fec43..e588793 100644
--- a/fs/romfs/source/main.c
+++ b/fs/romfs/source/main.c
@@ -57,7 +57,6 @@ int main(int argc, char **argv)
 
         gfxFlushBuffers();
         gfxSwapBuffers();
-        gfxWaitForVsync();
     }
 
     romfsExit();
diff --git a/fs/save/source/main.c b/fs/save/source/main.c
index 48bbd62..9f4ac93 100644
--- a/fs/save/source/main.c
+++ b/fs/save/source/main.c
@@ -138,7 +138,6 @@ int main(int argc, char **argv)
 
         gfxFlushBuffers();
         gfxSwapBuffers();
-        gfxWaitForVsync();
     }
 
     gfxExit();
diff --git a/fs/sdmc/source/main.c b/fs/sdmc/source/main.c
index 746cfe8..8567ae8 100644
--- a/fs/sdmc/source/main.c
+++ b/fs/sdmc/source/main.c
@@ -44,7 +44,6 @@ int main(int argc, char **argv)
 
         gfxFlushBuffers();
         gfxSwapBuffers();
-        gfxWaitForVsync();
     }
 
     gfxExit();
diff --git a/graphics/printing/hello-world/source/main.c b/graphics/printing/hello-world/source/main.c
index 7a18626..874b04a 100644
--- a/graphics/printing/hello-world/source/main.c
+++ b/graphics/printing/hello-world/source/main.c
@@ -27,7 +27,6 @@ int main(int argc, char **argv)
 
         gfxFlushBuffers();
         gfxSwapBuffers();
-        gfxWaitForVsync();
     }
 
     gfxExit();
diff --git a/graphics/printing/vt52-demo/source/main.c b/graphics/printing/vt52-demo/source/main.c
index 850c468..118bb4f 100644
--- a/graphics/printing/vt52-demo/source/main.c
+++ b/graphics/printing/vt52-demo/source/main.c
@@ -75,7 +75,6 @@ int main(int argc, char **argv)
 
         gfxFlushBuffers();
         gfxSwapBuffers();
-        gfxWaitForVsync();
     }
 
     gfxExit();
diff --git a/graphics/shared_font/source/main.c b/graphics/shared_font/source/main.c
index 8eae7ba..7c91d42 100644
--- a/graphics/shared_font/source/main.c
+++ b/graphics/shared_font/source/main.c
@@ -181,7 +181,6 @@ int main(int argc, char **argv)
 
         gfxFlushBuffers();
         gfxSwapBuffers();
-        gfxWaitForVsync();
     }
 
     if (faceret==0) FT_Done_Face(face);
diff --git a/graphics/simplegfx/source/main.c b/graphics/simplegfx/source/main.c
index de86653..ca1ab91 100644
--- a/graphics/simplegfx/source/main.c
+++ b/graphics/simplegfx/source/main.c
@@ -64,7 +64,6 @@ int main(int argc, char **argv)
 
         gfxFlushBuffers();
         gfxSwapBuffers();
-        gfxWaitForVsync();
     }
 
     gfxExit();
diff --git a/hid/irsensor/source/main.c b/hid/irsensor/source/main.c
index b280f36..c4430b6 100644
--- a/hid/irsensor/source/main.c
+++ b/hid/irsensor/source/main.c
@@ -113,7 +113,6 @@ int main(int argc, char **argv)
 
         gfxFlushBuffers();
         gfxSwapBuffers();
-        gfxWaitForVsync();
     }
 
     irsStopImageProcessor(irhandle);
diff --git a/hid/read-controls/source/main.c b/hid/read-controls/source/main.c
index b4cca71..96ec7d5 100644
--- a/hid/read-controls/source/main.c
+++ b/hid/read-controls/source/main.c
@@ -83,7 +83,6 @@ int main(int argc, char **argv)
 
         gfxFlushBuffers();
         gfxSwapBuffers();
-        gfxWaitForVsync();
     }
 
     gfxExit();
diff --git a/hid/touch-screen/source/main.c b/hid/touch-screen/source/main.c
index 0d17ddd..37aa357 100644
--- a/hid/touch-screen/source/main.c
+++ b/hid/touch-screen/source/main.c
@@ -54,7 +54,6 @@ int main(int argc, char **argv)
 
         gfxFlushBuffers();
         gfxSwapBuffers();
-        gfxWaitForVsync();
     }
 
     gfxExit();
diff --git a/hid/vibration/source/main.c b/hid/vibration/source/main.c
index 7639785..8bc3b82 100644
--- a/hid/vibration/source/main.c
+++ b/hid/vibration/source/main.c
@@ -92,7 +92,6 @@ int main(int argc, char **argv)
 
         gfxFlushBuffers();
         gfxSwapBuffers();
-        gfxWaitForVsync();
     }
 
     gfxExit();
diff --git a/jit/source/main.c b/jit/source/main.c
index aaa68cf..c2e6b85 100644
--- a/jit/source/main.c
+++ b/jit/source/main.c
@@ -60,7 +60,6 @@ int main(int argc, char **argv)
 
         gfxFlushBuffers();
         gfxSwapBuffers();
-        gfxWaitForVsync();
     }
 
     gfxExit();
diff --git a/network/nxlink_stdio/source/main.c b/network/nxlink_stdio/source/main.c
index 85593d6..5b3fc71 100644
--- a/network/nxlink_stdio/source/main.c
+++ b/network/nxlink_stdio/source/main.c
@@ -64,7 +64,6 @@ int main(int argc, char **argv) {
 
         gfxFlushBuffers();
         gfxSwapBuffers();
-        gfxWaitForVsync();
     }
 
     socketExit();
diff --git a/settings/get_system_language/source/main.c b/settings/get_system_language/source/main.c
index f77c711..712fedc 100644
--- a/settings/get_system_language/source/main.c
+++ b/settings/get_system_language/source/main.c
@@ -60,7 +60,6 @@ int main(int argc, char **argv)
 
         gfxFlushBuffers();
         gfxSwapBuffers();
-        gfxWaitForVsync();
     }
 
     setExit();
diff --git a/templates/application/source/main.c b/templates/application/source/main.c
index ff97b62..7f655fb 100644
--- a/templates/application/source/main.c
+++ b/templates/application/source/main.c
@@ -25,7 +25,6 @@ int main(int argc, char **argv)
 
         gfxFlushBuffers();
         gfxSwapBuffers();
-        gfxWaitForVsync();
     }
 
     gfxExit();
diff --git a/time/source/main.c b/time/source/main.c
index 713b97d..a53087f 100644
--- a/time/source/main.c
+++ b/time/source/main.c
@@ -43,7 +43,6 @@ int main(int argc, char **argv)
 
         gfxFlushBuffers();
         gfxSwapBuffers();
-        gfxWaitForVsync();
     }
 
     gfxExit();