diff --git a/src/KeyboardioFirmware.cpp b/src/KeyboardioFirmware.cpp
index d6e02f29..3e1c8065 100644
--- a/src/KeyboardioFirmware.cpp
+++ b/src/KeyboardioFirmware.cpp
@@ -16,7 +16,7 @@ Keyboardio_::setup(const byte keymap_count) {
     event_handler_hook_use (NULL);
     loop_hook_use (NULL);
 
-    Layer.defaultLayer (Storage.load_primary_keymap (keymap_count));
+    Layer.defaultLayer (KeyboardHardware.load_primary_layer (keymap_count));
 }
 
 custom_loop_t loopHooks[HOOK_MAX];
diff --git a/src/Storage.cpp b/src/Storage.cpp
deleted file mode 100644
index 882fef85..00000000
--- a/src/Storage.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-#include "Storage.h"
-
-
-Storage_::Storage_(void) {
-}
-
-void Storage_::save_primary_keymap(uint8_t keymap) {
-    EEPROM.write(EEPROM_KEYMAP_LOCATION, keymap);
-}
-
-uint8_t Storage_::load_primary_keymap(uint8_t keymap_count) {
-    uint8_t keymap =  EEPROM.read(EEPROM_KEYMAP_LOCATION);
-    if (keymap >= keymap_count) {
-        return 0; // undefined positions get saved as 255
-    }
-    return 0; //  return keymap;
-}
-
-Storage_ Storage;
diff --git a/src/Storage.h b/src/Storage.h
deleted file mode 100644
index 03caf182..00000000
--- a/src/Storage.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#pragma once
-
-#include <Arduino.h>
-#include <EEPROM.h>
-
-#define EEPROM_KEYMAP_LOCATION 0
-
-class Storage_ {
-  public:
-    Storage_(void);
-    uint8_t load_primary_keymap(uint8_t keymap_count);
-    void save_primary_keymap(uint8_t keymap);
-};
-
-extern Storage_ Storage;
diff --git a/src/key_events.h b/src/key_events.h
index 2a90f923..5ee039bc 100644
--- a/src/key_events.h
+++ b/src/key_events.h
@@ -2,10 +2,9 @@
 #include <Arduino.h>
 #include "KeyboardioHID.h"
 
+#include KEYBOARDIO_HARDWARE_H
 #include "key_defs.h"
 #include "keyswitch_state.h"
-#include "Storage.h"
-#include "keymap_metadata.h"
 #include "hooks.h"
 
 extern const Key keymaps[][ROWS][COLS];
diff --git a/src/keymap_metadata.h b/src/keymap_metadata.h
deleted file mode 100644
index 81207eba..00000000
--- a/src/keymap_metadata.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#pragma once
-
-#define COLS 16
-#define ROWS 4