diff --git a/src/input/mpegts.h b/src/input/mpegts.h
index a6721988..89816ea3 100644
--- a/src/input/mpegts.h
+++ b/src/input/mpegts.h
@@ -345,18 +345,6 @@ struct mpegts_service
    * see service.h for locking rules
    */
 
-  /**
-   * Descrambling support
-   */
-
-#ifdef TODO_MOVE_THIS_HERE
-  struct th_descrambler_list s_descramblers;
-  int s_scrambled;
-  int s_scrambled_seen;
-  int s_caid;
-  uint16_t s_prefcapid;
-#endif
-
   /**
    * When a subscription request SMT_MPEGTS, chunk them togeather 
    * in order to recude load.
diff --git a/src/service.c b/src/service.c
index 650d401d..77b253c5 100644
--- a/src/service.c
+++ b/src/service.c
@@ -294,10 +294,6 @@ service_stop(service_t *t)
   TAILQ_FOREACH(st, &t->s_components, es_link)
     stream_clean(st);
 
-#ifdef MOVE_TO_MPEGTS
-  sbuf_free(&t->s_tsbuf);
-#endif
-
   t->s_status = SERVICE_IDLE;
 
   pthread_mutex_unlock(&t->s_stream_mutex);
@@ -343,9 +339,6 @@ service_start(service_t *t, int instance)
 
   assert(t->s_status != SERVICE_RUNNING);
   t->s_streaming_status = 0;
-#ifdef MOVE_TO_V4L
-  t->s_pcr_drift = 0;
-#endif
 
   if((r = t->s_start_feed(t, instance)))
     return r;