diff --git a/libarmbox/dmx.cpp b/libarmbox/dmx.cpp
index 59b4172..687f3b8 100644
--- a/libarmbox/dmx.cpp
+++ b/libarmbox/dmx.cpp
@@ -69,8 +69,8 @@
 #include "dmx_lib.h"
 #include "lt_debug.h"
 
-/* Ugh... see comment in destructor for details... */
 #include "video_lib.h"
+/* needed for getSTC... */
 extern cVideo *videoDecoder;
 
 #define lt_debug(args...) _lt_debug(TRIPLE_DEBUG_DEMUX, this, args)
@@ -123,10 +123,6 @@ static const char *devname[NUM_DEMUXDEV] = {
 /* did we already DMX_SET_SOURCE on that demux device? */
 static bool init[NUM_DEMUXDEV] = { false, false, false, false, false, false, false, false };
 
-/* uuuugly */
-static int dmx_tp_count = 0;
-#define MAX_TS_COUNT 1
-
 cDemux::cDemux(int n)
 {
 	if (n < 0 || n >= NUM_DEMUX)
@@ -229,15 +225,6 @@ void cDemux::Close(void)
 	fd = -1;
 	if (measure)
 		return;
-	if (dmx_type == DMX_TP_CHANNEL)
-	{
-		dmx_tp_count--;
-		if (dmx_tp_count < 0)
-		{
-			lt_info("%s dmx_tp_count < 0!!\n", __func__);
-			dmx_tp_count = 0;
-		}
-	}
 }
 
 bool cDemux::Start(bool)