diff --git a/settings.txt b/settings.txt
index 0f45f10..198f2a9 100644
--- a/settings.txt
+++ b/settings.txt
@@ -134,21 +134,8 @@
 # Select faster method of scaling image to window size (nearest) or better quality (linear)
 #fast-render-scale = false
 
-# USB read pipeline tuning, number of libusb bulk transfers kept in flight and size of each USB transfer
-# Increase amount of async-usb-calls if you have issues with audio and video lagging behind
-# If you have mallformed message errors on RPI try to increase async-usb-calls
-#async-usb-calls = 32
-#usb-buffer-size = 2048
-
-# Number of buffered USB data slots queued for processing
-#usb-buffer = 128
-
-# Size of video and audio buffers. Increase if you see artifacts
-#video-buffer-size = 64
-#audio-buffer-size = 64
-
 # Audio delay for music and calls. Fill the buffer to this value before start playing.
-# Increase if you hear audio artifacts or tearing. Should be less than audio-buffer-size
+# Increase if you hear audio artifacts or tearing.
 #audio-buffer-wait = 2
 #audio-buffer-wait-call = 6
 
@@ -159,7 +146,6 @@
 
 # Delay navidation audio in milliseconds.
 # Adjust value so navigation guidance do not start before main audio fade out.
-# If you experience audio artifacts with high values increase audio-buffer-size 
 #audio-aux-delay = 200
 
 # Basic number of audio sample frames in the output buffer that is scaled by sample rate.
diff --git a/src/settings.cpp b/src/settings.cpp
index 8257203..4023d19 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -1,6 +1,7 @@
 #include "settings.h"
 
-#include <iostream>
+#include <algorithm>
+#include <cctype>
 #include <fstream>
 
 #include "common/logger.h"
@@ -10,7 +11,7 @@ bool Settings::load(const std::string &filename)
     std::ifstream file(filename);
     if (!file.is_open())
     {
-        log_e( "Cannot open file > %s", filename.c_str());
+        log_e("Cannot open file > %s", filename.c_str());
         return false;
     }
 
@@ -57,7 +58,7 @@ void Settings::print()
 {
     for (ISetting *setting : _settings())
     {
-        log_d("%s = %s",setting->name.c_str(), setting->asString().c_str());
+        log_d("%s = %s", setting->name.c_str(), setting->asString().c_str());
     }
 }
 
diff --git a/src/settings.h b/src/settings.h
index 7514aad..d546383 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -44,14 +44,9 @@ public:
     static inline Setting<int> forceRedraw{"force-redraw", 0};
     static inline Setting<int> forceRedrawTimeout{"force-redraw-timeout", 0};
     static inline Setting<float> aspectCorrection{"aspect-correction", 1};
-    static inline Setting<std::string> renderDriver{"renderer-driver", ""};    
-    static inline Setting<bool> alternativeRendering{"alternative-rendering", false};    
+    static inline Setting<std::string> renderDriver{"renderer-driver", ""};
+    static inline Setting<bool> alternativeRendering{"alternative-rendering", false};
     static inline Setting<bool> fastScale{"fast-render-scale", false};
-    static inline Setting<int> usbQueue{"async-usb-calls", 16};
-    static inline Setting<int> usbTransferSize{"usb-buffer-size", 20480};         
-    static inline Setting<int> usbBuffer{"usb-buffer", 64};        
-    static inline Setting<int> videoQueue{"video-buffer-size", 64};
-    static inline Setting<int> audioQueue{"audio-buffer-size", 64};
     static inline Setting<int> audioDelay{"audio-buffer-wait", 2};
     static inline Setting<int> audioDelayCall{"audio-buffer-wait-call", 6};
     static inline Setting<float> audioFade{"audio-fade", 0.3};