diff --git a/libraries/AP_HAL/AP_HAL_Boards.h b/libraries/AP_HAL/AP_HAL_Boards.h
index f83736d089..3a7c9f3161 100644
--- a/libraries/AP_HAL/AP_HAL_Boards.h
+++ b/libraries/AP_HAL/AP_HAL_Boards.h
@@ -111,8 +111,6 @@
 /* CPU classes, used to select if CPU intensive algorithms should be used
  * Note that these are only approximate, not exact CPU speeds. */
 
-/* DEPRECATED: 16Mhz: AVR2560 or similar */
-#define HAL_CPU_CLASS_16   1
 /* 150Mhz: PX4 or similar. Assumes:
  *  - hardware floating point
  *  - tens of kilobytes of memory available */
diff --git a/libraries/AP_HAL/board/empty.h b/libraries/AP_HAL/board/empty.h
index f1198d75fa..3849f68a58 100644
--- a/libraries/AP_HAL/board/empty.h
+++ b/libraries/AP_HAL/board/empty.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #define HAL_BOARD_NAME "EMPTY"
-#define HAL_CPU_CLASS HAL_CPU_CLASS_16
-#define HAL_STORAGE_SIZE            4096
+#define HAL_CPU_CLASS HAL_CPU_CLASS_150
+#define HAL_STORAGE_SIZE            16384
 #define HAL_STORAGE_SIZE_AVAILABLE  HAL_STORAGE_SIZE
 #define HAL_INS_DEFAULT HAL_INS_HIL
 #define HAL_BARO_DEFAULT HAL_BARO_HIL