diff --git a/firmware/asdf/src/Arch/asdf_arch_atmega2560.h b/firmware/asdf/src/Arch/asdf_arch_atmega2560.h
index a07a5da..86b5a1a 100644
--- a/firmware/asdf/src/Arch/asdf_arch_atmega2560.h
+++ b/firmware/asdf/src/Arch/asdf_arch_atmega2560.h
@@ -349,7 +349,7 @@
 #define TICK_COUNT 249
 
 // Default key matrix row scanner
-#define ASDF_ARCH_DEFAULT_SCANNER &asdf_arch_read_row
+#define ASDF_ARCH_DEFAULT_ROW_SCANNER &asdf_arch_read_row
 
 // Default keyboard output
 #define ASDF_ARCH_DEFAULT_OUTPUT &asdf_arch_send_code
diff --git a/firmware/asdf/src/Arch/asdf_arch_atmega328p.h b/firmware/asdf/src/Arch/asdf_arch_atmega328p.h
index 2bd5a5a..c8eec43 100644
--- a/firmware/asdf/src/Arch/asdf_arch_atmega328p.h
+++ b/firmware/asdf/src/Arch/asdf_arch_atmega328p.h
@@ -254,7 +254,7 @@
 
 
 // Default key matrix row scanner
-#define ASDF_ARCH_DEFAULT_SCANNER asdf_arch_read_row
+#define ASDF_ARCH_DEFAULT_ROW_SCANNER asdf_arch_read_row
 
 // Default keyboard output
 #define ASDF_ARCH_DEFAULT_OUTPUT asdf_arch_send_code
diff --git a/firmware/asdf/src/Arch/asdf_arch_test.h b/firmware/asdf/src/Arch/asdf_arch_test.h
index 500dd35..05e3d30 100644
--- a/firmware/asdf/src/Arch/asdf_arch_test.h
+++ b/firmware/asdf/src/Arch/asdf_arch_test.h
@@ -56,7 +56,7 @@ typedef enum {
 #define FLASH
 #define FLASH_READ (a) (*(a))
 #define FLASH_READ_MATRIX_ELEMENT(mat,row,col) (mat)[(row)][(col)]
-#define ASDF_ARCH_DEFAULT_SCANNER asdf_arch_read_row
+#define ASDF_ARCH_DEFAULT_ROW_SCANNER asdf_arch_read_row
 #define ASDF_ARCH_DEFAULT_OUTPUT asdf_arch_send_code
 
 // PROCEDURE: asdf_arch_pos_strobe
diff --git a/firmware/asdf/src/CMakeLists.txt b/firmware/asdf/src/CMakeLists.txt
index 310c6fa..0a52e65 100644
--- a/firmware/asdf/src/CMakeLists.txt
+++ b/firmware/asdf/src/CMakeLists.txt
@@ -37,9 +37,6 @@ create_keymap_valid("${keymap_list}" keymap_valid)
 create_keymap_report("${keymap_list}" keymap_report)
 create_keymap_declarations("${keymap_list}" keymap_declarations)
 
-# get list length and decrement by one to account for trailing semicolon
-list (LENGTH keymap_list num_keymaps)
-
 message("**********************")
 message("Keymap table: ${keymap_report}")
 message("**********************\n\n")
diff --git a/firmware/asdf/src/asdf_keymap_setup.h.in b/firmware/asdf/src/asdf_keymap_setup.h.in
index 1f076d0..2c3003f 100644
--- a/firmware/asdf/src/asdf_keymap_setup.h.in
+++ b/firmware/asdf/src/asdf_keymap_setup.h.in
@@ -27,8 +27,6 @@
 // this program. If not, see <https://www.gnu.org/licenses/>.
 //
 
-#define ASDF_NUM_KEYMAPS @num_keymaps@
-
 // PROCEDURE: asdf_keymap_setup
 // INPUTS: (uint8_t) index - index of the keymap setup function to call
 // OUTPUTS: none