diff --git a/panda/src/tinydisplay/Sources.pp b/panda/src/tinydisplay/Sources.pp
index 62caf6a834..c2c164ea7f 100644
--- a/panda/src/tinydisplay/Sources.pp
+++ b/panda/src/tinydisplay/Sources.pp
@@ -34,7 +34,6 @@
     tinyOsxGraphicsPipe.I tinyOsxGraphicsPipe.h \
     tinyOsxGraphicsWindow.h tinyOsxGraphicsWindow.I \
     $[if $[IS_OSX],tinyOsxGraphicsWindow.mm,] \
-    msghandling.h \
     zbuffer.h zfeatures.h zgl.h \
     zline.h zmath.h \
     ztriangle_1.cxx ztriangle_2.cxx \
@@ -53,7 +52,6 @@
     init.cxx \
     td_light.cxx \
     memory.cxx \
-    msghandling.cxx \
     specbuf.cxx \
     store_pixel.cxx \
     td_texture.cxx \
diff --git a/panda/src/tinydisplay/msghandling.cxx b/panda/src/tinydisplay/msghandling.cxx
deleted file mode 100644
index c72c59bf81..0000000000
--- a/panda/src/tinydisplay/msghandling.cxx
+++ /dev/null
@@ -1,55 +0,0 @@
-#include <stdarg.h>
-#include <stdio.h>
-
-#ifndef NDEBUG
-// Question: doesn't having this kinda defeat the purpose?
-#define NDEBUG
-#endif
-
-#ifdef NDEBUG
-#define NO_DEBUG_OUTPUT
-#endif
-
-/* Use this function to output messages when something unexpected
-   happens (which might be an indication of an error). *Don't* use it
-   when there's internal errors in the code - these should be handled
-   by asserts. */
-void
-tgl_warning(const char *format, ...)
-{
-#ifndef NO_DEBUG_OUTPUT
-  va_list args;
-  va_start(args, format);
-  fprintf(stderr, "*WARNING* ");
-  vfprintf(stderr, format, args);
-  va_end(args);
-#endif /* !NO_DEBUG_OUTPUT */
-}
-
-/* This function should be used for debug output only. */
-void
-tgl_trace(const char *format, ...)
-{
-#ifndef NO_DEBUG_OUTPUT
-  va_list args;
-  va_start(args, format);
-  fprintf(stderr, "*DEBUG* ");
-  vfprintf(stderr, format, args);
-  va_end(args);
-#endif /* !NO_DEBUG_OUTPUT */
-}
-
-/* Use this function to output info about things in the code which
-   should be fixed (missing handling of special cases, important
-   features not implemented, known bugs/buglets, ...). */
-void
-tgl_fixme(const char *format, ...)
-{
-#ifndef NO_DEBUG_OUTPUT
-  va_list args;
-  va_start(args, format);
-  fprintf(stderr, "*FIXME* ");
-  vfprintf(stderr, format, args);
-  va_end(args);
-#endif /* !NO_DEBUG_OUTPUT */
-}
diff --git a/panda/src/tinydisplay/msghandling.h b/panda/src/tinydisplay/msghandling.h
deleted file mode 100644
index ebe4548c0e..0000000000
--- a/panda/src/tinydisplay/msghandling.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef _msghandling_h_
-#define _msghandling_h_
-
-extern void tgl_warning(const char *text, ...);
-extern void tgl_trace(const char *text, ...);
-extern void tgl_fixme(const char *text, ...);
-
-#endif /* _msghandling_h_ */
diff --git a/panda/src/tinydisplay/specbuf.cxx b/panda/src/tinydisplay/specbuf.cxx
index 241b0be3cb..2297ced9aa 100644
--- a/panda/src/tinydisplay/specbuf.cxx
+++ b/panda/src/tinydisplay/specbuf.cxx
@@ -1,5 +1,4 @@
 #include "zgl.h"
-#include "msghandling.h"
 #include <math.h>
 #include <stdlib.h>
 
@@ -44,7 +43,6 @@ specbuf_get_buffer(GLContext *c, const int shininess_i,
     return buf;     
   }
   /* overwrite the lru buffer */
-  /*tgl_trace("overwriting spec buffer :(\n");*/
   oldest->shininess_i = shininess_i;
   oldest->last_used = c->specbuf_used_counter++;
   calc_buf(oldest, shininess);
diff --git a/panda/src/tinydisplay/td_light.cxx b/panda/src/tinydisplay/td_light.cxx
index d12ab50d77..b769617ced 100644
--- a/panda/src/tinydisplay/td_light.cxx
+++ b/panda/src/tinydisplay/td_light.cxx
@@ -1,5 +1,4 @@
 #include "zgl.h"
-#include "msghandling.h"
 #include <math.h>
 
 static inline float clampf(float a,float min,float max)
diff --git a/panda/src/tinydisplay/tinydisplay_composite1.cxx b/panda/src/tinydisplay/tinydisplay_composite1.cxx
index d0262553bc..95f28d5ca6 100755
--- a/panda/src/tinydisplay/tinydisplay_composite1.cxx
+++ b/panda/src/tinydisplay/tinydisplay_composite1.cxx
@@ -5,7 +5,6 @@
 #include "init.cxx"
 #include "td_light.cxx"
 #include "memory.cxx"
-#include "msghandling.cxx"
 #include "specbuf.cxx"
 #include "store_pixel.cxx"
 #include "td_texture.cxx"