diff --git a/meshtastic/deviceonly.options b/meshtastic/deviceonly.options
index 6f533177..82dffcf4 100644
--- a/meshtastic/deviceonly.options
+++ b/meshtastic/deviceonly.options
@@ -6,10 +6,6 @@
 
 *ChannelFile.channels max_count:8
 
-*OEMStore.oem_text max_size:40
-*OEMStore.oem_icon_bits max_size:2048
-*OEMStore.oem_aes_key max_size:32
-
 *DeviceState.node_remote_hardware_pins max_count:12
 
 *NodeInfoLite.channel int_size:8
diff --git a/meshtastic/deviceonly.proto b/meshtastic/deviceonly.proto
index 91367bf8..76bdfa8b 100644
--- a/meshtastic/deviceonly.proto
+++ b/meshtastic/deviceonly.proto
@@ -3,7 +3,6 @@ syntax = "proto3";
 package meshtastic;
 
 import "meshtastic/channel.proto";
-import "meshtastic/localonly.proto";
 import "meshtastic/mesh.proto";
 import "meshtastic/telemetry.proto";
 import "meshtastic/config.proto";
@@ -150,27 +149,6 @@ message NodeInfoLite {
   bool is_favorite = 10;
 }
 
-/*
- * Font sizes for the device screen
- */
-enum ScreenFonts {
-  /*
-   * TODO: REPLACE
-   */
-  FONT_SMALL = 0;
-
-  /*
-   * TODO: REPLACE
-   */
-  FONT_MEDIUM = 1;
-
-  /*
-   * TODO: REPLACE
-   */
-  FONT_LARGE = 2;
-}
-
-
 /*
  * This message is never sent over the wire, but it is used for serializing DB
  * state to flash in the device code
@@ -254,49 +232,3 @@ message ChannelFile {
    */
   uint32 version = 2;
 }
-
-/*
- * This can be used for customizing the firmware distribution. If populated,
- * show a secondary bootup screen with custom logo and text for 2.5 seconds.
- */
-message OEMStore {
-  /*
-   * The Logo width in Px
-   */
-  uint32 oem_icon_width = 1;
-
-  /*
-   * The Logo height in Px
-   */
-  uint32 oem_icon_height = 2;
-
-  /*
-   * The Logo in XBM bytechar format
-   */
-  bytes oem_icon_bits = 3;
-
-  /*
-   * Use this font for the OEM text.
-   */
-  ScreenFonts oem_font = 4;
-
-  /*
-   * Use this font for the OEM text.
-   */
-  string oem_text = 5;
-
-  /*
-   * The default device encryption key, 16 or 32 byte
-   */
-  bytes oem_aes_key = 6;
-
-  /*
-   * A Preset LocalConfig to apply during factory reset
-   */
-  LocalConfig oem_local_config = 7;
-
-  /*
-   * A Preset LocalModuleConfig to apply during factory reset
-   */
-  LocalModuleConfig oem_local_module_config = 8;
-}