diff --git a/haiku-apps/einsteinium/einsteinium-1.2.recipe b/haiku-apps/einsteinium/einsteinium-1.2.recipe
deleted file mode 100644
index 37afffced..000000000
--- a/haiku-apps/einsteinium/einsteinium-1.2.recipe
+++ /dev/null
@@ -1,96 +0,0 @@
-SUMMARY="Monitor applications and system services"
-DESCRIPTION="Einsteinium provides smarter monitoring of applications and \
-system services for Haiku. It can restart applications and system services \
-that were quit or crashed, gather statistics on application usage and \
-provides customizable ranked lists of applications."
-HOMEPAGE="https://sourceforge.net/projects/esforhaiku/"
-COPYRIGHT="2010-2016 Brian Hill"
-LICENSE="BSD (3-clause)"
-REVISION="1"
-SOURCE_URI="https://downloads.sourceforge.net/esforhaiku/Einsteinium-${portVersion}_source.zip"
-CHECKSUM_SHA256="0e34e56f49d89bfa219e79ab61d3a8ab113b131cad70a44c59d6a922c6c57f99"
-SOURCE_DIR="Einsteinium-${portVersion}_source"
-
-ARCHITECTURES="x86_gcc2 !x86"
-
-USER_SETTINGS_FILES="settings/Einsteinium directory"
-POST_INSTALL_SCRIPTS="$relativePostInstallDir/einsteinium_hpkg_postinstall.sh"
-
-PROVIDES="
-	einsteinium = $portVersion
-	app:Einsteinium = $portVersion
-	cmd:einsteinium_daemon = $portVersion
-	cmd:einsteinium_engine = $portVersion
-	"
-REQUIRES="
-	haiku
-	lib:libsqlite3
-	lib:libxml2
-	"
-
-BUILD_REQUIRES="
-	haiku_devel
-	devel:libsqlite3
-	devel:libxml2
-	"
-BUILD_PREREQUIRES="
-	makefile_engine
-	cmd:g++
-	cmd:make
-	"
-
-BUILD()
-{
-	cd src
-	for f in Engine Daemon; do
-		pushd $f
-		make $jobArgs OBJ_DIR=.
-		popd
-	done
-	for f in Preferences Launcher; do
-		pushd $f
-		make $jobArgs
-		popd
-	done
-}
-
-INSTALL()
-{
-	mkdir -p $appsDir/Einsteinium/EngineSubscriberKit
-	mkdir -p $binDir
-	mkdir -p $dataDir/Einsteinium
-	mkdir -p $dataDir/user_launch
-	mkdir -p $preferencesDir
-	mkdir -p $postInstallDir
-
-	# copy documentation
-	cp -af docs/ReadMe docs/License $appsDir/Einsteinium
-	cp -af "docs/Engine Subscriber's Development Guide" $appsDir/Einsteinium/EngineSubscriberKit
-
-	# post install script
-	cp -af scripts/einsteinium_hpkg_postinstall.sh $postInstallDir
-	chmod +x $postInstallDir/einsteinium_hpkg_postinstall.sh
-	cp -af src/Icons/notify_icon $dataDir/Einsteinium
-
-	# launch settings
-	cp -af scripts/einsteinium_userlaunch $dataDir/user_launch/Einsteinium
-
-	# copy executables
-	cd src
-	cp -af Engine/einsteinium_engine Daemon/einsteinium_daemon $binDir
-	cp -af Preferences/Einsteinium_Preferences $preferencesDir/Einsteinium
-	cp -af Launcher/Einsteinium_Launcher $appsDir/Einsteinium/Einsteinium\ Launcher
-
-	# create the Subscriber Example Kit
-	cp -af Engine/SubscriberExample/makefile \
-		Engine/SubscriberExample/subscriber_example \
-		Engine/SubscriberExample/subscriber_example.rsrc \
-		Engine/SubscriberExample/SubscriberExample.cpp \
-		Engine/EngineSubscriber.cpp \
-		Engine/EngineSubscriber.h \
-		$appsDir/Einsteinium/EngineSubscriberKit
-
-	# deskbar links
-	addPreferencesDeskbarSymlink $preferencesDir/Einsteinium
-	addAppDeskbarSymlink $appsDir/Einsteinium/Einsteinium\ Launcher
-}
diff --git a/haiku-apps/einsteinium/einsteinium-1.3.0.recipe b/haiku-apps/einsteinium/einsteinium-1.3.0.recipe
deleted file mode 100644
index 68cf5cc80..000000000
--- a/haiku-apps/einsteinium/einsteinium-1.3.0.recipe
+++ /dev/null
@@ -1,95 +0,0 @@
-SUMMARY="Monitor applications and system services"
-DESCRIPTION="Einsteinium provides smarter monitoring of applications and \
-system services for Haiku. It can restart applications and system services \
-that were quit or crashed, gather statistics on application usage and \
-provides customizable ranked lists of applications."
-HOMEPAGE="https://github.com/Perelandra0x309/einsteinium"
-COPYRIGHT="2010-2016 Brian Hill"
-LICENSE="BSD (3-clause)"
-REVISION="1"
-SOURCE_URI="https://github.com/Perelandra0x309/einsteinium/archive/v${portVersion}.tar.gz"
-CHECKSUM_SHA256="d2fdca86017e9bfc71b6c3be5f5f6fea2cb5e177be6e35a4426cb4f89fc5adda"
-
-ARCHITECTURES="x86_gcc2 !x86"
-
-USER_SETTINGS_FILES="settings/Einsteinium directory"
-POST_INSTALL_SCRIPTS="$relativePostInstallDir/einsteinium_hpkg_postinstall.sh"
-
-PROVIDES="
-	einsteinium = $portVersion
-	app:Einsteinium = $portVersion
-	cmd:einsteinium_daemon = $portVersion
-	cmd:einsteinium_engine = $portVersion
-	"
-REQUIRES="
-	haiku
-	lib:libsqlite3
-	lib:libxml2
-	"
-
-BUILD_REQUIRES="
-	haiku_devel
-	devel:libsqlite3
-	devel:libxml2
-	"
-BUILD_PREREQUIRES="
-	makefile_engine
-	cmd:g++
-	cmd:make
-	"
-
-BUILD()
-{
-	cd src
-	for f in Engine Daemon; do
-		pushd $f
-		make $jobArgs OBJ_DIR=.
-		popd
-	done
-	for f in Preferences Launcher; do
-		pushd $f
-		make $jobArgs
-		popd
-	done
-}
-
-INSTALL()
-{
-	mkdir -p $appsDir/Einsteinium/EngineSubscriberKit
-	mkdir -p $binDir
-	mkdir -p $dataDir/Einsteinium
-	mkdir -p $preferencesDir
-	mkdir -p $postInstallDir
-
-	# copy documentation
-	cp -af docs/ReadMe docs/License $appsDir/Einsteinium
-	cp -af "docs/Engine Subscriber's Development Guide" $appsDir/Einsteinium/EngineSubscriberKit
-
-	# post install script
-	cp -af scripts/einsteinium_hpkg_postinstall.sh $postInstallDir
-	chmod +x $postInstallDir/einsteinium_hpkg_postinstall.sh
-	cp -af src/Icons/notify_icon $dataDir/Einsteinium
-
-	# launch bootscript
-	cp -af scripts/EinsteiniumBootscript.sh $dataDir/Einsteinium
-	chmod +x $dataDir/Einsteinium/EinsteiniumBootscript.sh
-
-	# copy executables
-	cd src
-	cp -af Engine/einsteinium_engine Daemon/einsteinium_daemon $binDir
-	cp -af Preferences/Einsteinium_Preferences $preferencesDir/Einsteinium
-	cp -af Launcher/Einsteinium_Launcher $appsDir/Einsteinium/Einsteinium\ Launcher
-
-	# create the Subscriber Example Kit
-	cp -af Engine/SubscriberExample/makefile \
-		Engine/SubscriberExample/subscriber_example \
-		Engine/SubscriberExample/subscriber_example.rsrc \
-		Engine/SubscriberExample/SubscriberExample.cpp \
-		Engine/EngineSubscriber.cpp \
-		Engine/EngineSubscriber.h \
-		$appsDir/Einsteinium/EngineSubscriberKit
-
-	# deskbar links
-	addPreferencesDeskbarSymlink $preferencesDir/Einsteinium
-	addAppDeskbarSymlink $appsDir/Einsteinium/Einsteinium\ Launcher
-}
diff --git a/haiku-apps/einsteinium/einsteinium-1.3.1.recipe b/haiku-apps/einsteinium/einsteinium-1.3.1.recipe
deleted file mode 100644
index 7a37bb371..000000000
--- a/haiku-apps/einsteinium/einsteinium-1.3.1.recipe
+++ /dev/null
@@ -1,96 +0,0 @@
-SUMMARY="Monitor applications and system services"
-DESCRIPTION="Einsteinium provides smarter monitoring of applications and \
-system services for Haiku. It can restart applications and system services \
-that were quit or crashed, gather statistics on application usage and \
-provides customizable ranked lists of applications."
-HOMEPAGE="https://perelandra0x309.github.io/einsteinium"
-COPYRIGHT="2010-2016 Brian Hill"
-LICENSE="BSD (3-clause)"
-REVISION="1"
-SOURCE_URI="https://github.com/Perelandra0x309/einsteinium/archive/v${portVersion}.tar.gz"
-CHECKSUM_SHA256="962fd5cebc3bf7830b31b819242d15efe11912818d86b572da98c78f3ffe586c"
-
-ARCHITECTURES="x86_gcc2 !x86"
-
-USER_SETTINGS_FILES="settings/Einsteinium directory"
-POST_INSTALL_SCRIPTS="$relativePostInstallDir/einsteinium_hpkg_postinstall.sh"
-
-PROVIDES="
-	einsteinium = $portVersion
-	app:Einsteinium = $portVersion
-	cmd:einsteinium_daemon = $portVersion
-	cmd:einsteinium_engine = $portVersion
-	"
-REQUIRES="
-	haiku
-	lib:libsqlite3
-	lib:libxml2
-	"
-
-BUILD_REQUIRES="
-	haiku_devel
-	devel:libsqlite3
-	devel:libxml2
-	"
-BUILD_PREREQUIRES="
-	makefile_engine
-	cmd:g++
-	cmd:make
-	"
-
-BUILD()
-{
-	cd src
-	for f in Engine; do
-		pushd $f
-		make $jobArgs OBJ_DIR=_${f:0:1}objects
-		popd
-	done
-	for f in Daemon Launcher Preferences; do
-		pushd $f
-		make $jobArgs OBJ_DIR=_${f:0:1}objects
-		make bindcatalogs
-		popd
-	done
-}
-
-INSTALL()
-{
-	mkdir -p $appsDir/Einsteinium/EngineSubscriberKit
-	mkdir -p $binDir
-	mkdir -p $dataDir/Einsteinium
-	mkdir -p $preferencesDir
-	mkdir -p $postInstallDir
-
-	# copy documentation
-	cp -af docs/ReadMe.pdf docs/License $appsDir/Einsteinium
-	cp -af "docs/Engine Subscriber's Development Guide.pdf" $appsDir/Einsteinium/EngineSubscriberKit
-
-	# post install script
-	cp -af scripts/einsteinium_hpkg_postinstall.sh $postInstallDir
-	chmod +x $postInstallDir/einsteinium_hpkg_postinstall.sh
-	cp -af src/Icons/notify_icon $dataDir/Einsteinium
-
-	# launch bootscript
-	cp -af scripts/EinsteiniumBootscript.sh $dataDir/Einsteinium
-	chmod +x $dataDir/Einsteinium/EinsteiniumBootscript.sh
-
-	# copy executables
-	cd src
-	cp -af Engine/einsteinium_engine Daemon/einsteinium_daemon $binDir
-	cp -af Preferences/Einsteinium_Preferences $preferencesDir/Einsteinium
-	cp -af Launcher/Einsteinium_Launcher $appsDir/Einsteinium/Einsteinium\ Launcher
-
-	# create the Subscriber Example Kit
-	cp -af Engine/SubscriberExample/makefile \
-		Engine/SubscriberExample/subscriber_example \
-		Engine/SubscriberExample/subscriber_example.rsrc \
-		Engine/SubscriberExample/SubscriberExample.cpp \
-		Engine/EngineSubscriber.cpp \
-		Engine/EngineSubscriber.h \
-		$appsDir/Einsteinium/EngineSubscriberKit
-
-	# deskbar links
-	addPreferencesDeskbarSymlink $preferencesDir/Einsteinium
-	addAppDeskbarSymlink $appsDir/Einsteinium/Einsteinium\ Launcher
-}
diff --git a/haiku-apps/einsteinium/einsteinium-1.3.2.recipe b/haiku-apps/einsteinium/einsteinium-1.3.2.recipe
deleted file mode 100644
index 5e2dc8621..000000000
--- a/haiku-apps/einsteinium/einsteinium-1.3.2.recipe
+++ /dev/null
@@ -1,98 +0,0 @@
-SUMMARY="Monitor applications and system services"
-DESCRIPTION="Einsteinium provides smarter monitoring of applications and \
-system services for Haiku. It can restart applications and system services \
-that were quit or crashed, gather statistics on application usage and \
-provides customizable ranked lists of applications."
-HOMEPAGE="https://perelandra0x309.github.io/einsteinium"
-COPYRIGHT="2010-2016 Brian Hill"
-LICENSE="BSD (3-clause)"
-REVISION="1"
-SOURCE_URI="https://github.com/Perelandra0x309/einsteinium/archive/v${portVersion}.tar.gz"
-CHECKSUM_SHA256="9ac4c5b28f19ec5190eb2ee32e37cbb4594a8549a0fcc0dc58ee2a2e875bcfd5"
-
-ARCHITECTURES="x86_gcc2 x86 !x86_64"
-
-USER_SETTINGS_FILES="settings/Einsteinium directory"
-POST_INSTALL_SCRIPTS="$relativePostInstallDir/einsteinium_hpkg_postinstall.sh"
-
-PROVIDES="
-	einsteinium = $portVersion
-	app:Einsteinium = $portVersion
-	cmd:einsteinium_daemon = $portVersion
-	cmd:einsteinium_engine = $portVersion
-	"
-REQUIRES="
-	haiku
-	lib:libsqlite3
-	lib:libxml2
-	"
-
-BUILD_REQUIRES="
-	haiku_devel
-	devel:libsqlite3
-	devel:libxml2
-	"
-BUILD_PREREQUIRES="
-	makefile_engine
-	cmd:g++
-	cmd:make
-	"
-
-BUILD()
-{
-	cd src
-	for f in Engine; do
-		pushd $f
-		make $jobArgs OBJ_DIR=_${f:0:1}objects
-		popd
-	done
-	for f in Daemon Launcher Preferences; do
-		pushd $f
-		make $jobArgs OBJ_DIR=_${f:0:1}objects
-		make bindcatalogs OBJ_DIR=_${f:0:1}objects
-		popd
-	done
-}
-
-INSTALL()
-{
-	mkdir -p $appsDir/Einsteinium/EngineSubscriberKit
-	mkdir -p $binDir
-	mkdir -p $dataDir/Einsteinium
-	mkdir -p $preferencesDir
-	mkdir -p $postInstallDir
-
-	# copy documentation
-	cp -af docs/ReadMe.html docs/License $appsDir/Einsteinium
-	cp -af "docs/Engine Subscriber's Development Guide.pdf" \
-		$appsDir/Einsteinium/EngineSubscriberKit
-
-	# post install script
-	cp -af scripts/einsteinium_hpkg_postinstall.sh $postInstallDir
-	chmod +x $postInstallDir/einsteinium_hpkg_postinstall.sh
-	cp -af src/Icons/notify_icon $dataDir/Einsteinium
-
-	# launch bootscript
-	cp -af scripts/EinsteiniumBootscript.sh $dataDir/Einsteinium
-	chmod +x $dataDir/Einsteinium/EinsteiniumBootscript.sh
-
-	# copy executables
-	cd src
-	cp -af Engine/einsteinium_engine Daemon/einsteinium_daemon $binDir
-	cp -af Preferences/Einsteinium_Preferences $preferencesDir/Einsteinium
-	cp -af Launcher/Einsteinium_Launcher \
-		$appsDir/Einsteinium/Einsteinium\ Launcher
-
-	# create the Subscriber Example Kit
-	cp -af Engine/SubscriberExample/makefile \
-		Engine/SubscriberExample/subscriber_example \
-		Engine/SubscriberExample/subscriber_example.rsrc \
-		Engine/SubscriberExample/SubscriberExample.cpp \
-		Engine/EngineSubscriber.cpp \
-		Engine/EngineSubscriber.h \
-		$appsDir/Einsteinium/EngineSubscriberKit
-
-	# deskbar links
-	addPreferencesDeskbarSymlink $preferencesDir/Einsteinium
-	addAppDeskbarSymlink $appsDir/Einsteinium/Einsteinium\ Launcher
-}
diff --git a/haiku-apps/einsteinium/einsteinium-1.4.1.recipe b/haiku-apps/einsteinium/einsteinium-1.4.1.recipe
deleted file mode 100644
index dd904975a..000000000
--- a/haiku-apps/einsteinium/einsteinium-1.4.1.recipe
+++ /dev/null
@@ -1,101 +0,0 @@
-SUMMARY="Monitor applications and system services"
-DESCRIPTION="Einsteinium provides smarter monitoring of applications and \
-system services for Haiku. It can restart applications and system services \
-that were quit or crashed, gather statistics on application usage and \
-provides customizable ranked lists of applications."
-HOMEPAGE="https://perelandra0x309.github.io/einsteinium"
-COPYRIGHT="2010-2017 Brian Hill"
-LICENSE="BSD (3-clause)"
-REVISION="2"
-SOURCE_URI="https://github.com/Perelandra0x309/einsteinium/archive/v${portVersion}.tar.gz"
-CHECKSUM_SHA256="f7b96445ce7986d53c039e6be07112cdd28117115e433d552bd9d11f339c86d6"
-PATCHES="einsteinium-$portVersion.patchset"
-
-ARCHITECTURES="x86_gcc2 x86_64"
-
-USER_SETTINGS_FILES="settings/Einsteinium directory"
-POST_INSTALL_SCRIPTS="$relativePostInstallDir/einsteinium_hpkg_postinstall.sh"
-
-PROVIDES="
-	einsteinium = $portVersion
-	app:Einsteinium = $portVersion
-	cmd:einsteinium_daemon = $portVersion
-	cmd:einsteinium_engine = $portVersion
-	"
-REQUIRES="
-	haiku
-	lib:libsqlite3
-	lib:libxml2
-	"
-
-BUILD_REQUIRES="
-	haiku_devel
-	devel:libsqlite3
-	devel:libxml2
-	"
-BUILD_PREREQUIRES="
-	makefile_engine
-	cmd:g++
-	cmd:make
-	"
-
-BUILD()
-{
-	cd src
-	for f in Engine; do
-		pushd $f
-		make $jobArgs OBJ_DIR=_${f:0:1}objects
-		popd
-	done
-	for f in Daemon Launcher Preferences; do
-		pushd $f
-		make $jobArgs OBJ_DIR=_${f:0:1}objects
-		make bindcatalogs OBJ_DIR=_${f:0:1}objects
-		popd
-	done
-
-	rm Engine/SubscriberExample/subscriber_example
-	make -C Engine/SubscriberExample
-}
-
-INSTALL()
-{
-	mkdir -p $appsDir/Einsteinium/EngineSubscriberKit
-	mkdir -p $binDir
-	mkdir -p $dataDir/Einsteinium
-	mkdir -p $preferencesDir
-	mkdir -p $postInstallDir
-
-	# copy documentation
-	cp -af docs/ReadMe.html docs/License $appsDir/Einsteinium
-	cp -af "docs/Engine Subscriber's Development Guide.pdf" \
-		$appsDir/Einsteinium/EngineSubscriberKit
-
-	# post install script
-	cp -af scripts/einsteinium_hpkg_postinstall.sh $postInstallDir
-	chmod +x $postInstallDir/einsteinium_hpkg_postinstall.sh
-	cp -af src/Icons/notify_icon $dataDir/Einsteinium
-
-	# launch bootscript
-	cp -af scripts/EinsteiniumBootscript.sh $dataDir/Einsteinium
-	chmod +x $dataDir/Einsteinium/EinsteiniumBootscript.sh
-
-	# copy executables
-	cd src
-	cp -af Engine/einsteinium_engine Daemon/einsteinium_daemon $binDir
-	cp -af Preferences/Einsteinium_Preferences $preferencesDir/Einsteinium
-	cp -af Launcher/Einsteinium $appsDir/Einsteinium/Einsteinium
-
-	# create the Subscriber Example Kit
-	cp -af Engine/SubscriberExample/makefile \
-		Engine/SubscriberExample/subscriber_example \
-		Engine/SubscriberExample/subscriber_example.rsrc \
-		Engine/SubscriberExample/SubscriberExample.cpp \
-		Engine/EngineSubscriber.cpp \
-		Engine/EngineSubscriber.h \
-		$appsDir/Einsteinium/EngineSubscriberKit
-
-	# deskbar links
-	addPreferencesDeskbarSymlink $preferencesDir/Einsteinium
-	addAppDeskbarSymlink $appsDir/Einsteinium/Einsteinium
-}
diff --git a/haiku-apps/einsteinium/patches/einsteinium-1.4.1.patchset b/haiku-apps/einsteinium/patches/einsteinium-1.4.1.patchset
deleted file mode 100644
index bce0f4c29..000000000
--- a/haiku-apps/einsteinium/patches/einsteinium-1.4.1.patchset
+++ /dev/null
@@ -1,22 +0,0 @@
-From fe4fc6b943583ed7807c045603a45e5855dd2dc6 Mon Sep 17 00:00:00 2001
-From: Jerome Duval <jerome.duval@gmail.com>
-Date: Sun, 8 Oct 2017 13:50:25 +0200
-Subject: use STDCPPLIBS variable instead of stdc++.r4
-
-
-diff --git a/src/Engine/SubscriberExample/makefile b/src/Engine/SubscriberExample/makefile
-index 048c98f..0e590cc 100644
---- a/src/Engine/SubscriberExample/makefile
-+++ b/src/Engine/SubscriberExample/makefile
-@@ -2,7 +2,7 @@ NAME := subscriber_example
- TYPE := APP
- SRCS := ../EngineSubscriber.cpp \
- 	SubscriberExample.cpp
--LIBS := be tracker stdc++.r4
-+LIBS = be tracker $(STDCPPLIBS)
- OPTIMIZE := FULL
- RSRCS := subscriber_example.rsrc
- 
--- 
-2.14.2
-