diff --git a/src/libav.c b/src/libav.c
index c12c33f4..8a79254a 100644
--- a/src/libav.c
+++ b/src/libav.c
@@ -175,4 +175,3 @@ libav_init(void)
   av_log_set_level(AV_LOG_VERBOSE);
   av_register_all();
 }
-
diff --git a/src/main.c b/src/main.c
index 53a771b8..04d651e1 100644
--- a/src/main.c
+++ b/src/main.c
@@ -67,7 +67,6 @@
 #include "dbus.h"
 #if ENABLE_LIBAV
 #include "libav.h"
-#include "plumbing/transcoding.h"
 #endif
 #include "profile.h"
 
@@ -811,7 +810,6 @@ main(int argc, char **argv)
 
 #if ENABLE_LIBAV
   libav_init();
-  transcoding_init();
 #endif
 
   profile_init();
diff --git a/src/plumbing/transcoding.c b/src/plumbing/transcoding.c
index d82ed2b5..c571513b 100644
--- a/src/plumbing/transcoding.c
+++ b/src/plumbing/transcoding.c
@@ -113,8 +113,6 @@ typedef struct transcoder {
 			    x == AV_CODEC_ID_MP2  || x == AV_CODEC_ID_VORBIS)
 
 
-uint32_t transcoding_enabled = 0;
-
 /**
  * 
  */
@@ -1351,35 +1349,4 @@ transcoder_get_capabilities(void)
  */
 void transcoding_init(void)
 {
-  htsmsg_t *m;
-
-  if ((m = hts_settings_load("transcoding"))) {
-    htsmsg_get_u32(m, "enabled", &transcoding_enabled);
-    htsmsg_destroy(m);
-  }
-}
-
-
-/*
- * 
- */
-void transcoding_save(void)
-{
-  htsmsg_t *m = htsmsg_create_map();
-  htsmsg_add_u32(m, "enabled", transcoding_enabled);
-  hts_settings_save(m, "transcoding");
-}
-
-
-/*
- * 
- */
-int transcoding_set_enabled(uint32_t e)
-{
-  if (e == transcoding_enabled)
-    return 0;
-
-  transcoding_enabled = e;
-
-  return 1;
 }
diff --git a/src/plumbing/transcoding.h b/src/plumbing/transcoding.h
index d7a98b93..107f2275 100644
--- a/src/plumbing/transcoding.h
+++ b/src/plumbing/transcoding.h
@@ -42,5 +42,3 @@ void transcoder_set_properties  (streaming_target_t *tr,
 
 
 void transcoding_init(void);
-void transcoding_save(void);
-int  transcoding_set_enabled(uint32_t e);
diff --git a/src/webui/extjs.c b/src/webui/extjs.c
index b1b90749..9172368a 100755
--- a/src/webui/extjs.c
+++ b/src/webui/extjs.c
@@ -48,10 +48,6 @@
 #include "tvhtime.h"
 #include "input.h"
 
-#if ENABLE_LIBAV
-#include "plumbing/transcoding.h"
-#endif
-
 /**
  *
  */
@@ -495,11 +491,6 @@ extjs_config(http_connection_t *hc, const char *remain, void *opaque)
     htsmsg_add_u32(m, "tvhtime_ntp_enabled", tvhtime_ntp_enabled);
     htsmsg_add_u32(m, "tvhtime_tolerance", tvhtime_tolerance);
 
-    /* Transcoding */
-#if ENABLE_LIBAV
-    htsmsg_add_u32(m, "transcoding_enabled", transcoding_enabled);
-#endif
-
     pthread_mutex_unlock(&global_lock);
 
     out = json_single_record(m, "config");
@@ -527,14 +518,6 @@ extjs_config(http_connection_t *hc, const char *remain, void *opaque)
     if ((str = http_arg_get(&hc->hc_req_args, "tvhtime_tolerance")))
       tvhtime_set_tolerance(atoi(str));
 
-    /* Transcoding */
-#if ENABLE_LIBAV
-    str = http_arg_get(&hc->hc_req_args, "transcoding_enabled");
-    save = transcoding_set_enabled(!!str);
-    if (save)
-      transcoding_save();
-#endif
-
     pthread_mutex_unlock(&global_lock);
   
     out = htsmsg_create_map();