diff --git a/Makefile b/Makefile
index 7102c9186..f90808118 100644
--- a/Makefile
+++ b/Makefile
@@ -41,7 +41,7 @@ CORE_VERSION=	${CORE_COMMIT:C/-.*$//1}
 CORE_HASH=	${CORE_COMMIT:C/^.*-//1}
 .endif
 
-CORE_ABI?=	17.1
+CORE_ABI?=	17.7
 CORE_ARCH?=	${ARCH}
 CORE_OPENVPN?=	# empty
 CORE_PHP?=	70
diff --git a/plist b/plist
index d24ab47a9..bd932184a 100644
--- a/plist
+++ b/plist
@@ -313,9 +313,7 @@
 /usr/local/opnsense/contrib/simplepie/library/SimplePie/gzdecode.php
 /usr/local/opnsense/contrib/simplepie/phpunit.xml.dist
 /usr/local/opnsense/contrib/tzdata/iso3166.tab
-/usr/local/opnsense/firmware-message
 /usr/local/opnsense/firmware-product
-/usr/local/opnsense/firmware-upgrade
 /usr/local/opnsense/mvc/app/cache/README
 /usr/local/opnsense/mvc/app/config/config.php
 /usr/local/opnsense/mvc/app/config/loader.php
diff --git a/src/opnsense/firmware-message b/src/opnsense/firmware-message
deleted file mode 100644
index f8e6d3c89..000000000
--- a/src/opnsense/firmware-message
+++ /dev/null
@@ -1,11 +0,0 @@
-<p>OPNsense 17.1 "<em>Eclectic Eagle</em>" is now end of life. As such
-it will not receive any more updates, but the upgrade to the new 17.7 series is
-seamless and can be performed right here from the GUI by unlocking it below.</p>
-<p> Another method is to import and reinstall using a new installation image,
-which will retain your settings (selecting "Import Configuration"), then
-reformat the disk and apply a clean system (selecting "Guided Installation").</p>
-<p>You can also upgrade via console / SSH by using option 12 from the menu.</p>
-<p>Please backup your configuration, preview the new version via the live CD or
-in a virtual machine. Create snapshots. If all else fails, report back
-<a href="https://forum.opnsense.org/" target="_blank">in the forums</a> for
-assistance.</p>
diff --git a/src/opnsense/firmware-upgrade b/src/opnsense/firmware-upgrade
deleted file mode 100644
index ecf86d8dc..000000000
--- a/src/opnsense/firmware-upgrade
+++ /dev/null
@@ -1 +0,0 @@
-17.7