diff --git a/libraries/AP_HAL/AP_HAL_Boards.h b/libraries/AP_HAL/AP_HAL_Boards.h
index 437a3644eb..9b6af348b7 100644
--- a/libraries/AP_HAL/AP_HAL_Boards.h
+++ b/libraries/AP_HAL/AP_HAL_Boards.h
@@ -6,12 +6,9 @@
  * C preprocesor enumeration of the boards supported by the AP_HAL.
  * This list exists so HAL_BOARD == HAL_BOARD_xxx preprocessor blocks
  * can be used to exclude HAL boards from the build when appropriate.
- * Its not an elegant solution but we cant get too fancy if we want to
- * work with the Arduino mk and IDE builds without too much modification.
+ * Its not an elegant solution but we can improve it in future.
  */
 
-#define HAL_BOARD_APM1     1
-#define HAL_BOARD_APM2     2
 #define HAL_BOARD_SITL 3
 #define HAL_BOARD_SMACCM   4 // unused
 #define HAL_BOARD_PX4      5
@@ -42,12 +39,6 @@
 #define HAL_BOARD_SUBTYPE_PX4_V1         2000
 #define HAL_BOARD_SUBTYPE_PX4_V2         2001
 
-/**
-   HAL AVR sub-types, starting at 3000
- */
-#define HAL_BOARD_SUBTYPE_AVR_APM1       3000
-#define HAL_BOARD_SUBTYPE_AVR_APM2       3001
-
 /**
    HAL VRBRAIN sub-types, starting at 4000
  */
@@ -117,36 +108,7 @@
   HAL_OS_SOCKETS     :  has posix-like sockets
  */
 
-
-#if CONFIG_HAL_BOARD == HAL_BOARD_APM1
-#define HAL_BOARD_NAME "APM 1"
-#define HAL_CPU_CLASS HAL_CPU_CLASS_16
-#define HAL_STORAGE_SIZE            4096
-#define HAL_STORAGE_SIZE_AVAILABLE  HAL_STORAGE_SIZE
-#define HAL_INS_DEFAULT HAL_INS_OILPAN
-#define HAL_BARO_DEFAULT HAL_BARO_BMP085
-#define HAL_COMPASS_DEFAULT HAL_COMPASS_HMC5843
-#ifndef CONFIG_HAL_BOARD_SUBTYPE
-#define CONFIG_HAL_BOARD_SUBTYPE HAL_BOARD_SUBTYPE_AVR_APM1
-#endif
-
-#elif CONFIG_HAL_BOARD == HAL_BOARD_APM2
-#define HAL_BOARD_NAME "APM 2"
-#define HAL_CPU_CLASS HAL_CPU_CLASS_16
-#define HAL_STORAGE_SIZE            4096
-#define HAL_STORAGE_SIZE_AVAILABLE  HAL_STORAGE_SIZE
-#define HAL_INS_DEFAULT HAL_INS_MPU60XX_SPI
-#ifdef APM2_BETA_HARDWARE
-#define HAL_BARO_DEFAULT HAL_BARO_BMP085
-#else
-#define HAL_BARO_DEFAULT HAL_BARO_MS5611_SPI
-#endif
-#define HAL_COMPASS_DEFAULT HAL_COMPASS_HMC5843
-#ifndef CONFIG_HAL_BOARD_SUBTYPE
-#define CONFIG_HAL_BOARD_SUBTYPE HAL_BOARD_SUBTYPE_AVR_APM2
-#endif
-
-#elif CONFIG_HAL_BOARD == HAL_BOARD_SITL
+#if CONFIG_HAL_BOARD == HAL_BOARD_SITL
 #define HAL_BOARD_NAME "SITL"
 #define HAL_CPU_CLASS HAL_CPU_CLASS_1000
 #define HAL_OS_POSIX_IO 1
diff --git a/libraries/AP_HAL/AP_HAL_Main.h b/libraries/AP_HAL/AP_HAL_Main.h
index 30bfd49618..fcf3fae03f 100644
--- a/libraries/AP_HAL/AP_HAL_Main.h
+++ b/libraries/AP_HAL/AP_HAL_Main.h
@@ -3,7 +3,7 @@
 
 #include "HAL.h"
 
-#if CONFIG_HAL_BOARD == HAL_BOARD_APM1 || CONFIG_HAL_BOARD == HAL_BOARD_APM2 || CONFIG_HAL_BOARD == HAL_BOARD_FLYMAPLE
+#if CONFIG_HAL_BOARD == HAL_BOARD_FLYMAPLE
 #define CONFIG_MAIN_WITHOUT_ARGC_ARGV 1
 #endif