diff --git a/platformio.ini b/platformio.ini
index 798ce487..d9b77444 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -11,10 +11,10 @@
 
 ; ---> SELECT TARGET PLATFORM HERE! <---
 [platformio]
-;env_default = generic
+env_default = generic
 ;env_default = heltec
 ;env_default = ttgov1
-env_default = ttgov2
+;env_default = ttgov2
 ;env_default = ttgov21
 ;env_default = ttgobeam
 ;env_default = lopy
diff --git a/src/antenna.cpp b/src/antenna.cpp
index 196080b4..46c6c77e 100644
--- a/src/antenna.cpp
+++ b/src/antenna.cpp
@@ -2,8 +2,6 @@
 
 #ifdef HAS_ANTENNA_SWITCH
 
-#include <Arduino.h>
-
 // Local logging tag
 static const char TAG[] = "wifi";
 
diff --git a/src/globals.h b/src/globals.h
index a904bdb8..7738b8a7 100644
--- a/src/globals.h
+++ b/src/globals.h
@@ -71,8 +71,6 @@ extern portMUX_TYPE timerMux;
 
 // class for preparing payload data
 #include "payload.h"
-
-// payload encoder
 #if PAYLOAD_ENCODER == 1
 extern TTNplain payload;
 #elif PAYLOAD_ENCODER == 2
@@ -83,7 +81,6 @@ extern CayenneLPP payload;
 #error "No valid payload converter defined"
 #endif
 
-
 void reset_counters(void);
 void blink_LED(uint16_t set_color, uint16_t set_blinkduration);
 void led_loop(void);
diff --git a/src/payload.h b/src/payload.h
index 3a06a948..7dec9d04 100644
--- a/src/payload.h
+++ b/src/payload.h
@@ -1,8 +1,6 @@
 #ifndef _PAYLOAD_H_
 #define _PAYLOAD_H_
 
-#include <Arduino.h>
-
 // MyDevices CayenneLPP channels
 #define LPP_GPS_CHANNEL 20
 #define LPP_COUNT_WIFI_CHANNEL 21