diff --git a/sys-power/auto-cpufreq/auto-cpufreq-2.3.0.ebuild b/sys-power/auto-cpufreq/auto-cpufreq-2.3.0.ebuild
index 5694dc67a8..19c577dd3e 100644
--- a/sys-power/auto-cpufreq/auto-cpufreq-2.3.0.ebuild
+++ b/sys-power/auto-cpufreq/auto-cpufreq-2.3.0.ebuild
@@ -130,6 +130,11 @@ pkg_postrm() {
 		rm "${EROOT}"/var/log/auto-cpufreq.log || die
 	fi
 
+	# Remove auto-cpufreq-install script
+	if [ -f "${EROOT}/usr/bin/auto-cpufreq-install" ]; then
+		rm "${EROOT}"/usr/bin/auto-cpufreq-install || die
+	fi
+
 	# Restore original cpufreqctl binary if backup was made
 	if [ -f "${EROOT}/usr/bin/cpufreqctl.auto-cpufreq.bak" ]; then
 		mv "${EROOT}"/usr/bin/cpufreqctl.auto-cpufreq{.bak,} || die
diff --git a/sys-power/auto-cpufreq/files/auto-cpufreq-remove-poetry_versioning.patch b/sys-power/auto-cpufreq/files/auto-cpufreq-remove-poetry_versioning.patch
deleted file mode 100644
index c48110495a..0000000000
--- a/sys-power/auto-cpufreq/files/auto-cpufreq-remove-poetry_versioning.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/pyproject.toml b/pyproject.toml
-index c555726..f3ea0ab 100644
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -33,7 +33,7 @@ poetry = "^1.6.1"
- 
- [build-system]
- requires = ["poetry-core>=1.0.0", "poetry-dynamic-versioning>=1.0.0,<2.0.0"]
--build-backend = "poetry_dynamic_versioning.backend"
-+build-backend = "poetry.core.masonry.api"
- 
- [tool.poetry.scripts]
- auto-cpufreq = "auto_cpufreq.bin.auto_cpufreq:main"
diff --git a/sys-power/auto-cpufreq/files/auto-cpufreq-remove-setuptools_git_versioning.patch b/sys-power/auto-cpufreq/files/auto-cpufreq-remove-setuptools_git_versioning.patch
deleted file mode 100644
index c5d9460521..0000000000
--- a/sys-power/auto-cpufreq/files/auto-cpufreq-remove-setuptools_git_versioning.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Remove the automatic setuptools_git_versioning because distutils can not handle that.  
-
---- a/setup.py
-+++ b/setup.py
-@@ -17,13 +17,7 @@ VERSION = "1.9.5"
- 
- setup(
-     name="auto-cpufreq",
--    setuptools_git_versioning={
--        "starting_version": VERSION,
--        "template": "{tag}+{sha}",
--        "dev_template": "{tag}+{sha}",
--        "dirty_template": "{tag}+{sha}.post{ccount}.dirty"
--    },
--    setup_requires=["setuptools-git-versioning"],
-+    version=VERSION,
-     description="Automatic CPU speed & power optimizer for Linux",
-     long_description=readme,
-     author="Adnan Hodzic",
diff --git a/sys-power/auto-cpufreq/files/auto-cpufreq.service b/sys-power/auto-cpufreq/files/auto-cpufreq.service
deleted file mode 100644
index 494942d835..0000000000
--- a/sys-power/auto-cpufreq/files/auto-cpufreq.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=auto-cpufreq - Automatic CPU speed & power optimizer for Linux
-After=network.target network-online.target
-
-[Service]
-Type=simple
-User=root
-ExecStart=auto-cpufreq --daemon
-Restart=on-failure
-
-[Install]
-WantedBy=multi-user.target