diff --git a/components/cmd_i2c/cmd_i2ctools.c b/components/cmd_i2c/cmd_i2ctools.c
index 5ec0a53d..1ef62307 100644
--- a/components/cmd_i2c/cmd_i2ctools.c
+++ b/components/cmd_i2c/cmd_i2ctools.c
@@ -6,7 +6,7 @@
    software is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
    CONDITIONS OF ANY KIND, either express or implied.
 */
-#define LOG_LOCAL_LEVEL ESP_LOG_DEBUG
+
 #include <stdio.h>
 #include "cmd_i2ctools.h"
 #include "argtable3/argtable3.h"
diff --git a/components/cmd_i2c/component.mk b/components/cmd_i2c/component.mk
index 2215a6d8..0b379962 100644
--- a/components/cmd_i2c/component.mk
+++ b/components/cmd_i2c/component.mk
@@ -1,7 +1,7 @@
 #
 # Main Makefile. This is basically the same as a component makefile.
 #
-CFLAGS += -D LOG_LOCAL_LEVEL=ESP_LOG_DEBUG \
+CFLAGS += -D LOG_LOCAL_LEVEL=ESP_LOG_INFO \
 	-I$(COMPONENT_PATH)/../tools				
 COMPONENT_ADD_INCLUDEDIRS := .
 COMPONENT_ADD_INCLUDEDIRS += $(COMPONENT_PATH)/../tools
diff --git a/components/cmd_nvs/cmd_nvs.c b/components/cmd_nvs/cmd_nvs.c
index 9d2f1470..57f03187 100644
--- a/components/cmd_nvs/cmd_nvs.c
+++ b/components/cmd_nvs/cmd_nvs.c
@@ -6,7 +6,7 @@
    software is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
    CONDITIONS OF ANY KIND, either express or implied.
 */
-//#define LOG_LOCAL_LEVEL ESP_LOG_VERBOSE
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/components/cmd_system/cmd_system.c b/components/cmd_system/cmd_system.c
index 4b8b7b82..02f6e0ad 100644
--- a/components/cmd_system/cmd_system.c
+++ b/components/cmd_system/cmd_system.c
@@ -6,7 +6,7 @@
    software is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
    CONDITIONS OF ANY KIND, either express or implied.
 */
-#define LOG_LOCAL_LEVEL ESP_LOG_INFO
+
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
diff --git a/components/config/config.c b/components/config/config.c
index c167a186..def9c9d2 100644
--- a/components/config/config.c
+++ b/components/config/config.c
@@ -18,7 +18,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-//#define LOG_LOCAL_LEVEL ESP_LOG_VERBOSE
 #include "config.h"
 #include "nvs_utilities.h"
 
diff --git a/components/config/nvs_utilities.c b/components/config/nvs_utilities.c
index 8627ed75..040743cf 100644
--- a/components/config/nvs_utilities.c
+++ b/components/config/nvs_utilities.c
@@ -1,4 +1,3 @@
-//#define LOG_LOCAL_LEVEL ESP_LOG_VERBOSE
 #include "nvs_utilities.h"
 
 #include <stdio.h>
diff --git a/components/services/audio_controls.c b/components/services/audio_controls.c
index 8bcd9887..995c2043 100644
--- a/components/services/audio_controls.c
+++ b/components/services/audio_controls.c
@@ -18,7 +18,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-//#define LOG_LOCAL_LEVEL ESP_LOG_DEBUG
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
diff --git a/components/squeezelite-ota/component.mk b/components/squeezelite-ota/component.mk
index 35902feb..7f4b4f39 100644
--- a/components/squeezelite-ota/component.mk
+++ b/components/squeezelite-ota/component.mk
@@ -9,5 +9,5 @@ COMPONENT_ADD_INCLUDEDIRS += include
 COMPONENT_EXTRA_INCLUDES += $(PROJECT_PATH)/main/
 COMPONENT_EXTRA_INCLUDES += $(PROJECT_PATH)/components/tools
 CFLAGS += -D LOG_LOCAL_LEVEL=ESP_LOG_INFO -DCONFIG_OTA_ALLOW_HTTP=1
-#CFLAGS += -DLOG_LOCAL_LEVEL=ESP_LOG_DEBUG -DCONFIG_OTA_ALLOW_HTTP=1
+
 
diff --git a/components/squeezelite-ota/squeezelite-ota.c b/components/squeezelite-ota/squeezelite-ota.c
index ef840ab5..b9d76a7e 100644
--- a/components/squeezelite-ota/squeezelite-ota.c
+++ b/components/squeezelite-ota/squeezelite-ota.c
@@ -6,9 +6,6 @@
    software is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
    CONDITIONS OF ANY KIND, either express or implied.
 */
-#ifndef LOG_LOCAL_LEVEL
-#define LOG_LOCAL_LEVEL ESP_LOG_INFO
-#endif
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
 #include "esp_system.h"
diff --git a/components/wifi-manager/component.mk b/components/wifi-manager/component.mk
index 58cbe8da..9b6972bb 100644
--- a/components/wifi-manager/component.mk
+++ b/components/wifi-manager/component.mk
@@ -8,8 +8,7 @@
 #
 COMPONENT_EMBED_FILES := style.css code.js index.html bootstrap.min.css.gz jquery.min.js.gz popper.min.js.gz bootstrap.min.js.gz
 
-#CFLAGS += -D LOG_LOCAL_LEVEL=ESP_LOG_DEBUG 
-CFLAGS += -D LOG_LOCAL_LEVEL=ESP_LOG_DEBUG \
+CFLAGS += -D LOG_LOCAL_LEVEL=ESP_LOG_INFO \
 	-I$(COMPONENT_PATH)/../tools			
 COMPONENT_ADD_INCLUDEDIRS := .
 COMPONENT_ADD_INCLUDEDIRS += $(COMPONENT_PATH)/../tools
diff --git a/components/wifi-manager/http_server_handlers.c b/components/wifi-manager/http_server_handlers.c
index a0ae6bb3..56b27aa0 100644
--- a/components/wifi-manager/http_server_handlers.c
+++ b/components/wifi-manager/http_server_handlers.c
@@ -254,7 +254,7 @@ session_context_t* get_session_context(httpd_req_t *req){
 	}
 	session_context_t *ctx_data = (session_context_t*)req->sess_ctx;
 	ctx_data->sess_ip_address = http_alloc_get_socket_address(req, 0, &ctx_data->port);
-	ESP_LOGI_LOC(TAG, "serving %s to peer %s port %u", req->uri, ctx_data->sess_ip_address , ctx_data->port);
+	ESP_LOGD_LOC(TAG, "serving %s to peer %s port %u", req->uri, ctx_data->sess_ip_address , ctx_data->port);
 	return (session_context_t *)req->sess_ctx;
 }
 
@@ -382,7 +382,7 @@ esp_err_t root_get_handler(httpd_req_t *req){
 
 esp_err_t resource_filehandler(httpd_req_t *req){
     char filepath[FILE_PATH_MAX];
-   ESP_LOGI_LOC(TAG, "serving [%s]", req->uri);
+   ESP_LOGD_LOC(TAG, "serving [%s]", req->uri);
 
    const char *filename = get_path_from_uri(filepath, req->uri, sizeof(filepath));
 
@@ -437,7 +437,7 @@ esp_err_t resource_filehandler(httpd_req_t *req){
 	   httpd_resp_send_err(req, HTTPD_404_NOT_FOUND, "File does not exist");
 	   return ESP_FAIL;
    }
-   ESP_LOGI_LOC(TAG, "Resource sending complete");
+   ESP_LOGD_LOC(TAG, "Resource sending complete");
    return ESP_OK;
 
 }
@@ -589,7 +589,7 @@ esp_err_t config_post_handler(httpd_req_t *req){
 			err = ESP_FAIL;
 		}
 		if(err == ESP_OK){
-			ESP_LOGI_LOC(TAG,"Found config value name [%s]", prev_item->string);
+			ESP_LOGD_LOC(TAG,"Found config value name [%s]", prev_item->string);
 			nvs_type_t item_type=  config_get_item_type(prev_item);
 			if(item_type!=0){
 				void * val = config_safe_alloc_get_entry_value(item_type, prev_item);
@@ -614,7 +614,7 @@ esp_err_t config_post_handler(httpd_req_t *req){
 							err = ESP_FAIL;
 						}
 						else {
-							ESP_LOGI_LOC(TAG,"Successfully set value for [%s]",prev_item->string);
+							ESP_LOGD_LOC(TAG,"Successfully set value for [%s]",prev_item->string);
 						}
 					}
 					free(val);
diff --git a/components/wifi-manager/http_server_handlers.h b/components/wifi-manager/http_server_handlers.h
index 93cdcac2..82a10560 100644
--- a/components/wifi-manager/http_server_handlers.h
+++ b/components/wifi-manager/http_server_handlers.h
@@ -60,7 +60,6 @@ function to process requests, decode URLs, serve files, etc. etc.
 #include "lwip/priv/tcp_priv.h"
 #include "lwip/priv/tcpip_priv.h"
 #include "esp_vfs.h"
-#define LOG_LOCAL_LEVEL ESP_LOG_DEBUG
 
 
 #ifdef __cplusplus
diff --git a/main/component.mk b/main/component.mk
index 4226d6c1..dc5314b1 100644
--- a/main/component.mk
+++ b/main/component.mk
@@ -6,7 +6,6 @@
 # lib(subdirectory_name).a in the build directory. This behaviour is entirely configurable,
 # please read the SDK documents if you need to do this.
 #
-#CFLAGS += -D LOG_LOCAL_LEVEL=ESP_LOG_DEBUG
 CFLAGS += -D LOG_LOCAL_LEVEL=ESP_LOG_INFO -DMODEL_NAME=SqueezeESP32
 COMPONENT_ADD_INCLUDEDIRS += 	$(COMPONENT_PATH)/../tools	\
 								$(COMPONENT_PATH)/../config
diff --git a/main/esp_app_main.c b/main/esp_app_main.c
index 12fa0284..e8921048 100644
--- a/main/esp_app_main.c
+++ b/main/esp_app_main.c
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-#define LOG_LOCAL_LEVEL ESP_LOG_DEBUG
+
 #include "platform_esp32.h"
 #include "led.h"
 #include <stdio.h>