diff --git a/src/include/86box/machine.h b/src/include/86box/machine.h
index 9d225d35d..5dd95b673 100644
--- a/src/include/86box/machine.h
+++ b/src/include/86box/machine.h
@@ -517,7 +517,6 @@ extern int machine_at_403tg_d_mr_init(const machine_t *);
 extern int machine_at_pb450_init(const machine_t *);
 extern int machine_at_pb450_init(const machine_t *);
 extern int machine_at_pc330_6573_init(const machine_t *);
-extern int machine_at_m45xx_init(const machine_t *);
 extern int machine_at_mvi486_init(const machine_t *);
 
 extern int machine_at_sis401_init(const machine_t *);
@@ -531,7 +530,6 @@ extern int machine_at_dtk486_init(const machine_t *);
 extern int machine_at_px471_init(const machine_t *);
 extern int machine_at_win471_init(const machine_t *);
 extern int machine_at_pci400ca_init(const machine_t *);
-extern int machine_at_zmartin_init(const machine_t *);
 extern int machine_at_vi15g_init(const machine_t *);
 extern int machine_at_greenb_init(const machine_t *);
 
diff --git a/src/machine/m_at_386dx_486.c b/src/machine/m_at_386dx_486.c
index f5d31b0c2..b8d4c2e48 100644
--- a/src/machine/m_at_386dx_486.c
+++ b/src/machine/m_at_386dx_486.c
@@ -731,35 +731,6 @@ machine_at_pc330_6573_init(const machine_t *model) /* doesn't like every CPU oth
     return ret;
 }
 
-int
-machine_at_m45xx_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear_inverted("roms/machines/m45xx/optoli_082594.rom",
-                                    0x000e0000, 131072, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init_ex(model, 2);
-    device_add(&ami_1994_nvr_device);
-
-    pci_init(PCI_CONFIG_TYPE_1);
-    pci_register_slot(0x10, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
-    pci_register_slot(0x15, PCI_CARD_NORMAL,      4, 1, 2, 3);
-    pci_register_slot(0x16, PCI_CARD_NORMAL,      3, 4, 1, 2);
-
-    device_add(&opti802g_pci_device);
-    device_add(&opti822_device);
-    device_add(&keyboard_ps2_ami_pci_device);
-    device_add(&fdc37c665_device);
-    device_add(&ide_vlb_2ch_device);
-    device_add(&intel_flash_bxt_device); // Just in case, no idea if it has it or not
-
-    return ret;
-}
-
 int
 machine_at_mvi486_init(const machine_t *model)
 {
@@ -914,25 +885,6 @@ machine_at_pci400ca_init(const machine_t *model)
     return ret;
 }
 
-int
-machine_at_zmartin_init(const machine_t *model)
-{
-    int ret;
-
-    ret = bios_load_linear("roms/machines/zeos_martin/rel11.bin",
-                           0x000e0000, 131072, 0);
-
-    if (bios_only || !ret)
-        return ret;
-
-    machine_at_common_init(model);
-    device_add(&keyboard_at_device);
-    device_add(&intel_flash_bxt_ami_device);
-    device_add(&fdc37c651_device);
-
-    return ret;
-}
-
 int
 machine_at_vi15g_init(const machine_t *model)
 {
diff --git a/src/machine/machine_table.c b/src/machine/machine_table.c
index e46434e56..4e7dfb2c9 100644
--- a/src/machine/machine_table.c
+++ b/src/machine/machine_table.c
@@ -6165,46 +6165,7 @@ const machine_t machines[] = {
         .snd_device = NULL,
         .net_device = NULL
     },
-    /* KBC?? Does the VLSI have On-Chip KBC? */
-    {
-        .name = "[VLSI 82C480] ZEOS Martin",
-        .internal_name = "zmartin",
-        .type = MACHINE_TYPE_486_S2,
-        .chipset = MACHINE_CHIPSET_VLSI_VL82C480,
-        .init = machine_at_zmartin_init,
-        .p1_handler = NULL,
-        .gpio_handler = NULL,
-        .available_flag = MACHINE_AVAILABLE,
-        .gpio_acpi_handler = NULL,
-        .cpu = {
-            .package = CPU_PKG_SOCKET3,
-            .block = CPU_BLOCK_NONE,
-            .min_bus = 0,
-            .max_bus = 0,
-            .min_voltage = 0,
-            .max_voltage = 0,
-            .min_multi = 0,
-            .max_multi = 0
-        },
-        .bus_flags = MACHINE_VLB,
-        .flags = MACHINE_SUPER_IO,
-        .ram = {
-            .min = 1024,
-            .max = 65536,
-            .step = 1024
-        },
-        .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
-        .gpio = 0xffffffff,
-        .gpio_acpi = 0xffffffff,
-        .device = NULL,
-        .fdc_device = NULL,
-        .sio_device = NULL, //&fdc37c651_device,
-        .vid_device = NULL,
-        .snd_device = NULL,
-        .net_device = NULL
-    },
+
 
     /* 486 machines - Socket 3 */
     /* 486 machines with just the ISA slot */
@@ -7139,46 +7100,6 @@ const machine_t machines[] = {
         .snd_device = NULL,
         .net_device = NULL
     },
-    /* Absolutely no information. Anything here is guesswork. */
-    {
-        .name = "[OPTi 802GP] Olivetti M4-5xx",
-        .internal_name = "m45xx",
-        .type = MACHINE_TYPE_486_S3,
-        .chipset = MACHINE_CHIPSET_OPTI_895_802G, //OPTi 802GP
-        .init = machine_at_m45xx_init,
-        .p1_handler = NULL,
-        .gpio_handler = NULL,
-        .available_flag = MACHINE_AVAILABLE,
-        .gpio_acpi_handler = NULL,
-        .cpu = {
-            .package = CPU_PKG_SOCKET3,
-            .block = CPU_BLOCK_NONE,
-            .min_bus = 0,
-            .max_bus = 0,
-            .min_voltage = 0,
-            .max_voltage = 0,
-            .min_multi = 0,
-            .max_multi = 0
-        },
-        .bus_flags = MACHINE_PS2_PCIV,
-        .flags = MACHINE_IDE | MACHINE_APM,
-        .ram = {
-            .min = 1024,
-            .max = 65536,
-            .step = 1024
-        },
-        .nvrmask = 127,
-        .kbc_device = NULL,
-        .kbc_p1 = 0xff,
-        .gpio = 0xffffffff,
-        .gpio_acpi = 0xffffffff,
-        .device = NULL,
-        .fdc_device = NULL,
-        .sio_device = NULL,
-        .vid_device = NULL,
-        .snd_device = NULL,
-        .net_device = NULL
-    },
     /* This has an AMIKey-2, which is an updated version of type 'H'. */
     {
         .name = "[i420EX] ASUS PVI-486AP4",