diff --git a/.gitignore b/.gitignore
index 6e2501700..dd0db7220 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ htmljs/node_modules/
 .DS_Store
 .vscode/*.db
 .vscode/.browse.c_cpp.db*
+.pio/
diff --git a/platformio.ini b/platformio.ini
index 2a99a661d..cb52f7f0b 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -9,7 +9,7 @@
 ; http://docs.platformio.org/page/projectconf.html
 
 [platformio]
-env_default = sonoff, sonoff-esp8285 
+default_envs = development
 #sonoff OTA no longer supported
 #env_default = classic, classic-spanish, classic-portuguese-br, classic-slovak, classic-tw, newui, newui-tw, newui-spanish, newui-portuguese-br, newui-slovak,  newui-oled, thorrax, sonoff, sonoff-esp8285 , thorrax-classic
 
@@ -32,7 +32,9 @@ build_flags = -Wl,-Tesp8266.flash.4m2m.ld
 monitor_speed = 115200
 lib_deps = ${common_env_data.lib_deps_external} 
 
-upload_port = /dev/cu.wchusbserial1410
+#upload_port not needed since platformio autoselects
+#If autoselect fails, uncomment below and set port
+#upload_port = /dev/cu.wchusbserial1410
 
 [env:development-esp8285]
 #board_build.flash_mode = dout
@@ -46,10 +48,13 @@ build_flags = -Wl,-Tesp8266.flash.1m64.ld -DBOARD=Sonoff -DUseClassicFrontEnd=tr
 lib_deps = ${common_env_data.lib_deps_external}
 
 
-monitor_speed = 115200
-lib_deps = ${common_env_data.lib_deps_external} 
+#Duplicates
+#monitor_speed = 115200
+#lib_deps = ${common_env_data.lib_deps_external} 
 
-upload_port = /dev/cu.wchusbserial1410
+#upload_port not needed since platformio autoselects
+#If autoselect fails, uncomment below and set port
+#upload_port = /dev/cu.wchusbserial1410
 
 
 [env:classic]