diff --git a/es-app/src/PlatformId.cpp b/es-app/src/PlatformId.cpp
index 8a3d54045..9b76d08e5 100644
--- a/es-app/src/PlatformId.cpp
+++ b/es-app/src/PlatformId.cpp
@@ -42,7 +42,6 @@ namespace PlatformIds
         "atomiswave",           // Sammy Corporation Atomiswave
         "bbcmicro",             // Acorn Computers BBC Micro
         "c64",                  // Commodore 64
-        "cavestory",            // Cave Story (NXEngine)
         "cdimono1",             // Philips CD-i
         "cdtv",                 // Commodore CDTV
         "channelf",             // Fairchild Channel F
diff --git a/es-app/src/PlatformId.h b/es-app/src/PlatformId.h
index bd826f0c6..dccaf987f 100644
--- a/es-app/src/PlatformId.h
+++ b/es-app/src/PlatformId.h
@@ -41,7 +41,6 @@ namespace PlatformIds
         ATOMISWAVE,
         BBC_MICRO,
         COMMODORE_64,
-        CAVESTORY,
         PHILIPS_CDI,
         COMMODORE_CDTV,
         FAIRCHILD_CHANNELF,
diff --git a/es-app/src/scrapers/GamesDBJSONScraper.cpp b/es-app/src/scrapers/GamesDBJSONScraper.cpp
index 1fc1fddea..2e6257c51 100644
--- a/es-app/src/scrapers/GamesDBJSONScraper.cpp
+++ b/es-app/src/scrapers/GamesDBJSONScraper.cpp
@@ -60,7 +60,6 @@ namespace
         {BBC_MICRO, "5013"},
         {BIT_CORPORATION_GAMATE, "5004"},
         {CASIO_PV1000, "4964"},
-        {CAVESTORY, "1"},
         {COLECOVISION, "31"},
         {COMMODORE_64, "40"},
         {COMMODORE_AMIGA, "4911"},
diff --git a/es-app/src/scrapers/ScreenScraper.cpp b/es-app/src/scrapers/ScreenScraper.cpp
index dafbc3c96..b701d423c 100644
--- a/es-app/src/scrapers/ScreenScraper.cpp
+++ b/es-app/src/scrapers/ScreenScraper.cpp
@@ -52,7 +52,6 @@ namespace
         {BBC_MICRO, 37},
         {BIT_CORPORATION_GAMATE, 266},
         {CASIO_PV1000, 74},
-        {CAVESTORY, 135},
         {COLECO_ADAM, 89},
         {COLECOVISION, 48},
         {VTECH_CREATIVISION, 241},
diff --git a/resources/sorting/hwtype_year/es_systems_sorting.xml b/resources/sorting/hwtype_year/es_systems_sorting.xml
index cb93c5bc4..601383b85 100644
--- a/resources/sorting/hwtype_year/es_systems_sorting.xml
+++ b/resources/sorting/hwtype_year/es_systems_sorting.xml
@@ -109,10 +109,6 @@
         <name>c64</name>
         <systemsortname>Computer - 1982</systemsortname>
     </system>
-    <system>
-        <name>cavestory</name>
-        <systemsortname>Engine - 2004</systemsortname>
-    </system>
     <system>
         <name>cdimono1</name>
         <systemsortname>Console - 1991</systemsortname>
diff --git a/resources/sorting/manufacturer_hwtype_year/es_systems_sorting.xml b/resources/sorting/manufacturer_hwtype_year/es_systems_sorting.xml
index e0ba6133c..8b8a2ecc8 100644
--- a/resources/sorting/manufacturer_hwtype_year/es_systems_sorting.xml
+++ b/resources/sorting/manufacturer_hwtype_year/es_systems_sorting.xml
@@ -109,10 +109,6 @@
         <name>c64</name>
         <systemsortname>Commodore - Computer - 1982</systemsortname>
     </system>
-    <system>
-        <name>cavestory</name>
-        <systemsortname>Studio Pixel - Engine - 2004</systemsortname>
-    </system>
     <system>
         <name>cdimono1</name>
         <systemsortname>Philips - Console - 1991</systemsortname>
diff --git a/resources/sorting/manufacturer_year/es_systems_sorting.xml b/resources/sorting/manufacturer_year/es_systems_sorting.xml
index 76539b280..bcba05006 100644
--- a/resources/sorting/manufacturer_year/es_systems_sorting.xml
+++ b/resources/sorting/manufacturer_year/es_systems_sorting.xml
@@ -109,10 +109,6 @@
         <name>c64</name>
         <systemsortname>Commodore - 1982</systemsortname>
     </system>
-    <system>
-        <name>cavestory</name>
-        <systemsortname>Studio Pixel - 2004</systemsortname>
-    </system>
     <system>
         <name>cdimono1</name>
         <systemsortname>Philips - 1991</systemsortname>
diff --git a/resources/sorting/year/es_systems_sorting.xml b/resources/sorting/year/es_systems_sorting.xml
index e73508973..0a6523500 100644
--- a/resources/sorting/year/es_systems_sorting.xml
+++ b/resources/sorting/year/es_systems_sorting.xml
@@ -109,10 +109,6 @@
         <name>c64</name>
         <systemsortname>1982</systemsortname>
     </system>
-    <system>
-        <name>cavestory</name>
-        <systemsortname>2004</systemsortname>
-    </system>
     <system>
         <name>cdimono1</name>
         <systemsortname>1991</systemsortname>
diff --git a/resources/systems/macos/es_systems.xml b/resources/systems/macos/es_systems.xml
index 44b490190..91bec1c64 100644
--- a/resources/systems/macos/es_systems.xml
+++ b/resources/systems/macos/es_systems.xml
@@ -299,15 +299,6 @@
         <platform>c64</platform>
         <theme>c64</theme>
     </system>
-    <system>
-        <name>cavestory</name>
-        <fullname>Cave Story (NXEngine)</fullname>
-        <path>%ROMPATH%/cavestory</path>
-        <extension>.exe .EXE .7z .7Z .zip .ZIP</extension>
-        <command label="NXEngine">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/nxengine_libretro.dylib %ROM%</command>
-        <platform>cavestory</platform>
-        <theme>cavestory</theme>
-    </system>
     <system>
         <name>cdimono1</name>
         <fullname>Philips CD-i</fullname>
diff --git a/resources/systems/unix/es_systems.xml b/resources/systems/unix/es_systems.xml
index 5b9ee861a..0da844a66 100644
--- a/resources/systems/unix/es_systems.xml
+++ b/resources/systems/unix/es_systems.xml
@@ -308,15 +308,6 @@
         <platform>c64</platform>
         <theme>c64</theme>
     </system>
-    <system>
-        <name>cavestory</name>
-        <fullname>Cave Story (NXEngine)</fullname>
-        <path>%ROMPATH%/cavestory</path>
-        <extension>.exe .EXE .7z .7Z .zip .ZIP</extension>
-        <command label="NXEngine">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/nxengine_libretro.so %ROM%</command>
-        <platform>cavestory</platform>
-        <theme>cavestory</theme>
-    </system>
     <system>
         <name>cdimono1</name>
         <fullname>Philips CD-i</fullname>
diff --git a/resources/systems/windows/es_systems.xml b/resources/systems/windows/es_systems.xml
index 14bf9165d..f6a2fe2d0 100644
--- a/resources/systems/windows/es_systems.xml
+++ b/resources/systems/windows/es_systems.xml
@@ -305,15 +305,6 @@
         <platform>c64</platform>
         <theme>c64</theme>
     </system>
-    <system>
-        <name>cavestory</name>
-        <fullname>Cave Story (NXEngine)</fullname>
-        <path>%ROMPATH%\cavestory</path>
-        <extension>.exe .EXE .7z .7Z .zip .ZIP</extension>
-        <command label="NXEngine">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\nxengine_libretro.dll %ROM%</command>
-        <platform>cavestory</platform>
-        <theme>cavestory</theme>
-    </system>
     <system>
         <name>cdimono1</name>
         <fullname>Philips CD-i</fullname>