diff --git a/src/freedombone-app-babel b/src/freedombone-app-babel
index 33aa6040..5282c746 100755
--- a/src/freedombone-app-babel
+++ b/src/freedombone-app-babel
@@ -69,10 +69,6 @@ function restore_remote_babel {
 }
 
 function remove_babel {
-    if [[ $(app_is_installed babel) == "0" ]]; then
-        return
-    fi
-
     ${PROJECT_NAME}-mesh-install -f babel --remove yes
     if [ ! "$?" = "0" ]; then
         echo $'Failed to remove babel'
diff --git a/src/freedombone-app-batman b/src/freedombone-app-batman
index 5fda61d3..f012e415 100755
--- a/src/freedombone-app-batman
+++ b/src/freedombone-app-batman
@@ -83,10 +83,6 @@ function restore_remote_batman {
 }
 
 function remove_batman {
-    if [[ $(app_is_installed batman) == "0" ]]; then
-        return
-    fi
-
     ${PROJECT_NAME}-mesh-install -f batman --remove yes
     if [ ! "$?" = "0" ]; then
         echo $'Failed to remove batman'
diff --git a/src/freedombone-app-blog b/src/freedombone-app-blog
index 9691a9d2..e27332fd 100755
--- a/src/freedombone-app-blog
+++ b/src/freedombone-app-blog
@@ -330,9 +330,6 @@ function restore_remote_blog {
 }
 
 function remove_blog {
-    if [[ $(app_is_installed blog) == "0" ]]; then
-        return
-    fi
     if [ ${#FULLBLOG_DOMAIN_NAME} -eq 0 ]; then
         return
     fi
diff --git a/src/freedombone-app-cjdns b/src/freedombone-app-cjdns
index 855cb15a..58436ad4 100755
--- a/src/freedombone-app-cjdns
+++ b/src/freedombone-app-cjdns
@@ -182,9 +182,6 @@ function restore_remote_cjdns {
 }
 
 function remove_cjdns {
-    if [[ $(app_is_installed cjdns) == "0" ]]; then
-        return
-    fi
     service cjdns stop
     ip6tables -D nat -D POSTROUTING -o tun0 -j MASQUERADE
     ip6tables -D FORWARD -i tun0 -o eth0 -m state --state RELATED,ESTABLISHED -j ACCEPT
diff --git a/src/freedombone-app-dlna b/src/freedombone-app-dlna
index 5a715295..81343780 100755
--- a/src/freedombone-app-dlna
+++ b/src/freedombone-app-dlna
@@ -155,9 +155,6 @@ function restore_remote_dlna {
 }
 
 function remove_dlna {
-    if [[ $(app_is_installed dlna) == "0" ]]; then
-        return
-    fi
     service minidlna stop
     apt-get -y remove --purge minidlna
     if [ -f /etc/minidlna.conf ]; then
diff --git a/src/freedombone-app-emacs b/src/freedombone-app-emacs
index c3048ec3..93c39624 100755
--- a/src/freedombone-app-emacs
+++ b/src/freedombone-app-emacs
@@ -98,9 +98,6 @@ function restore_remote_emacs {
 }
 
 function remove_emacs {
-    if [[ $(app_is_installed emacs) == "0" ]]; then
-        return
-    fi
     apt-get -y remove --purge emacs24
     update-alternatives --set editor /usr/bin/nano
     sed -i '/install_emacs/d' $COMPLETION_FILE
diff --git a/src/freedombone-app-gnusocial b/src/freedombone-app-gnusocial
index 24ba10d0..1dc0462d 100755
--- a/src/freedombone-app-gnusocial
+++ b/src/freedombone-app-gnusocial
@@ -348,9 +348,6 @@ function restore_remote_gnusocial {
 }
 
 function remove_gnusocial {
-    if [[ $(app_is_installed gnusocial) == "0" ]]; then
-        return
-    fi
     if [ ${#MICROBLOG_DOMAIN_NAME} -eq 0 ]; then
         return
     fi
diff --git a/src/freedombone-app-gogs b/src/freedombone-app-gogs
index e7135c80..5ce2f639 100755
--- a/src/freedombone-app-gogs
+++ b/src/freedombone-app-gogs
@@ -377,10 +377,6 @@ function restore_remote_gogs {
 }
 
 function remove_gogs {
-    if [[ $(app_is_installed gogs) == "0" ]]; then
-        return
-    fi
-
     if [ ${#GIT_DOMAIN_NAME} -eq 0 ]; then
         return
     fi
diff --git a/src/freedombone-app-hubzilla b/src/freedombone-app-hubzilla
index d352e5a5..6d24d49e 100755
--- a/src/freedombone-app-hubzilla
+++ b/src/freedombone-app-hubzilla
@@ -317,9 +317,6 @@ function restore_remote_hubzilla {
 }
 
 function remove_hubzilla {
-    if [[ $(app_is_installed hubzilla) == "0" ]]; then
-        return
-    fi
     if [ ${#HUBZILLA_DOMAIN_NAME} -eq 0 ]; then
         return
     fi
diff --git a/src/freedombone-app-ipfs b/src/freedombone-app-ipfs
index 74e23915..1d1a5f34 100755
--- a/src/freedombone-app-ipfs
+++ b/src/freedombone-app-ipfs
@@ -157,9 +157,6 @@ function restore_remote_ipfs {
 }
 
 function remove_ipfs_go {
-    if [[ $(app_is_installed ipfs_go) == "0" ]]; then
-        return
-    fi
     systemctl stop ipfs
     systemctl disable ipfs
     systemctl daemon-reload
@@ -174,9 +171,6 @@ function remove_ipfs_go {
 }
 
 function remove_ipfs_js {
-    if [[ $(app_is_installed ipfs_js) == "0" ]]; then
-        return
-    fi
     systemctl stop ipfs
     systemctl disable ipfs
     rm /etc/systemd/system/ipfs.service
diff --git a/src/freedombone-app-irc b/src/freedombone-app-irc
index e15ca45f..66ee52d4 100755
--- a/src/freedombone-app-irc
+++ b/src/freedombone-app-irc
@@ -234,9 +234,6 @@ function restore_remote_irc {
 }
 
 function remove_irc {
-    if [[ $(app_is_installed irc) == "0" ]]; then
-        return
-    fi
     remove_watchdog_daemon ngircd
     systemctl stop ngircd
     apt-get -y remove --purge ngircd
diff --git a/src/freedombone-app-librevault b/src/freedombone-app-librevault
index b25b0923..bafcbf60 100755
--- a/src/freedombone-app-librevault
+++ b/src/freedombone-app-librevault
@@ -107,9 +107,6 @@ function restore_remote_librevault {
 }
 
 function remove_librevault {
-    if [[ $(app_is_installed librevault) == "0" ]]; then
-        return
-    fi
     iptables -D INPUT -p udp --dport $LIBREVAULT_PORT -j ACCEPT
     iptables -D INPUT -p tcp --dport $LIBREVAULT_PORT -j ACCEPT
     function_check save_firewall_settings
diff --git a/src/freedombone-app-mumble b/src/freedombone-app-mumble
index fe7cdea3..76658ee5 100755
--- a/src/freedombone-app-mumble
+++ b/src/freedombone-app-mumble
@@ -152,9 +152,6 @@ function restore_remote_mumble {
 }
 
 function remove_mumble {
-    if [[ $(app_is_installed mumble) == "0" ]]; then
-        return
-    fi
     apt-get -y remove --purge mumble-server
     if [[ $ONION_ONLY == "no" ]]; then
         iptables -D INPUT -p udp --dport $MUMBLE_PORT -j ACCEPT
diff --git a/src/freedombone-app-rss b/src/freedombone-app-rss
index 587bdf23..cff28a2f 100755
--- a/src/freedombone-app-rss
+++ b/src/freedombone-app-rss
@@ -244,9 +244,6 @@ function restore_remote_rss {
 }
 
 function remove_rss {
-    if [[ $(app_is_installed rss) == "0" ]]; then
-        return
-    fi
     if [ ${#RSS_READER_DOMAIN_NAME} -eq 0 ]; then
         return
     fi
diff --git a/src/freedombone-app-searx b/src/freedombone-app-searx
index cdb6c8d7..2afb7738 100755
--- a/src/freedombone-app-searx
+++ b/src/freedombone-app-searx
@@ -96,9 +96,6 @@ function restore_remote_searx {
 }
 
 function remove_searx {
-    if [[ $(app_is_installed searx) == "0" ]]; then
-        return
-    fi
     systemctl stop searx
     systemctl disable searx
     rm /etc/systemd/system/searx.service
diff --git a/src/freedombone-app-sip b/src/freedombone-app-sip
index c26286b8..8af613e6 100755
--- a/src/freedombone-app-sip
+++ b/src/freedombone-app-sip
@@ -155,10 +155,6 @@ function restore_remote_sip {
 }
 
 function remove_sip {
-    if [[ $(app_is_installed sip) == "0" ]]; then
-        return
-    fi
-
     iptables -D INPUT -p udp --dport $TURN_PORT -j ACCEPT
     iptables -D INPUT -p tcp --dport $TURN_PORT -j ACCEPT
     iptables -D INPUT -p tcp --dport $TURN_TLS_PORT -j ACCEPT
diff --git a/src/freedombone-app-syncthing b/src/freedombone-app-syncthing
index 05f6c0e0..373b904e 100755
--- a/src/freedombone-app-syncthing
+++ b/src/freedombone-app-syncthing
@@ -460,9 +460,6 @@ function restore_remote_syncthing {
 }
 
 function remove_syncthing {
-    if ! grep -Fxq "install_syncthing" $COMPLETION_FILE; then
-        return
-    fi
     iptables -D INPUT -p udp --dport $SYNCTHING_PORT -j ACCEPT
     iptables -D INPUT -p tcp --dport $SYNCTHING_PORT -j ACCEPT
     function_check save_firewall_settings
diff --git a/src/freedombone-app-tahoelafs b/src/freedombone-app-tahoelafs
index 24c1b896..db4e28d5 100755
--- a/src/freedombone-app-tahoelafs
+++ b/src/freedombone-app-tahoelafs
@@ -183,9 +183,6 @@ function restore_remote_tahoelafs {
 }
 
 function remove_tahoelafs {
-    if [[ $(app_is_installed tahoelafs) == "0" ]]; then
-        return
-    fi
     iptables -D INPUT -p udp --dport $TAHOELAFS_PORT -j ACCEPT
     iptables -D INPUT -p tcp --dport $TAHOELAFS_PORT -j ACCEPT
     function_check save_firewall_settings
diff --git a/src/freedombone-app-tox b/src/freedombone-app-tox
index f5988d70..a0050118 100755
--- a/src/freedombone-app-tox
+++ b/src/freedombone-app-tox
@@ -224,10 +224,6 @@ function restore_remote_tox {
 }
 
 function remove_tox_node {
-    if [[ $(app_is_installed tox_node) == "0" ]]; then
-        return
-    fi
-
     iptables -D INPUT -p tcp --dport $TOX_PORT -j ACCEPT
     iptables -D INPUT -p udp --dport $TOX_PORT -j ACCEPT
     function_check save_firewall_settings
@@ -246,9 +242,6 @@ function remove_tox_node {
 }
 
 function remove_tox_avahi {
-    if [[ $(app_is_installed tox_avahi) == "0" ]]; then
-        return
-    fi
     cd $INSTALL_DIR/toxid
     make uninstall
     rm -rf $INSTALL_DIR/toxid
@@ -256,10 +249,6 @@ function remove_tox_avahi {
 }
 
 function remove_tox_client {
-    if [[ $(app_is_installed tox_client) == "0" ]]; then
-        return
-    fi
-
     ${PROJECT_NAME}-mesh-install -f tox_client --remove yes
     if [ ! "$?" = "0" ]; then
         echo $'Could not remove Tox client'
diff --git a/src/freedombone-app-webmail b/src/freedombone-app-webmail
index 34de6bc6..cb0e7d26 100755
--- a/src/freedombone-app-webmail
+++ b/src/freedombone-app-webmail
@@ -123,9 +123,6 @@ function restore_remote_webmail {
 }
 
 function remove_webmail {
-    if [[ $(app_is_installed webmail) == "0" ]]; then
-        return
-    fi
     nginx_dissite webmail
     if [ -f /etc/nginx/sites-available/webmail ]; then
         rm /etc/nginx/sites-available/webmail
diff --git a/src/freedombone-app-wiki b/src/freedombone-app-wiki
index 33d59509..19730383 100755
--- a/src/freedombone-app-wiki
+++ b/src/freedombone-app-wiki
@@ -210,9 +210,6 @@ function restore_remote_wiki {
 }
 
 function remove_wiki {
-    if [[ $(app_is_installed wiki) == "0" ]]; then
-        return
-    fi
     if [ ${#WIKI_DOMAIN_NAME} -eq 0 ]; then
         return
     fi
diff --git a/src/freedombone-app-xmpp b/src/freedombone-app-xmpp
index 47924e6f..684a9dde 100755
--- a/src/freedombone-app-xmpp
+++ b/src/freedombone-app-xmpp
@@ -261,18 +261,12 @@ function configure_firewall_for_xmpp {
 }
 
 function remove_xmpp_client {
-    if [[ $(app_is_installed xmpp_client) == "0" ]]; then
-        return
-    fi
     apt-get -y remove --purge profanity
     sed '/install_xmpp_client/d' $COMPLETION_FILE
 }
 
 function remove_xmpp {
     remove_xmpp_client
-    if [[ $(app_is_installed xmpp) == "0" ]]; then
-        return
-    fi
     iptables -D INPUT -p tcp --dport 5222:5223 -j ACCEPT
     iptables -D INPUT -p tcp --dport 5269 -j ACCEPT
     iptables -D INPUT -p tcp --dport 5280:5281 -j ACCEPT
diff --git a/src/freedombone-app-zeronet b/src/freedombone-app-zeronet
index 47c277d5..c73348e8 100755
--- a/src/freedombone-app-zeronet
+++ b/src/freedombone-app-zeronet
@@ -97,9 +97,6 @@ function restore_remote_zeronet {
 }
 
 function remove_zeronet_blog {
-    if [[ $(app_is_installed zeronet_blog) == "0" ]]; then
-        return
-    fi
     if [ -d $MESH_INSTALL_DIR/zeronet/ZeroBlog ]; then
         rm -rf $MESH_INSTALL_DIR/zeronet/ZeroBlog
     fi
@@ -108,9 +105,6 @@ function remove_zeronet_blog {
 }
 
 function remove_zeronet_mail {
-    if [[ $(app_is_installed zeronet_mail) == "0" ]]; then
-        return
-    fi
     if [ -d $MESH_INSTALL_DIR/zeronet/ZeroMail ]; then
         rm -rf $MESH_INSTALL_DIR/zeronet/ZeroMail
     fi
@@ -119,9 +113,6 @@ function remove_zeronet_mail {
 }
 
 function remove_zeronet_forum {
-    if [[ $(app_is_installed zeronet_forum) == "0" ]]; then
-        return
-    fi
     if [ -d $MESH_INSTALL_DIR/zeronet/ZeroTalk ]; then
         rm -rf $MESH_INSTALL_DIR/zeronet/ZeroTalk
     fi
@@ -133,9 +124,6 @@ function remove_zeronet {
     remove_zeronet_blog
     remove_zeronet_mail
     remove_zeronet_forum
-    if [[ $(app_is_installed zeronet) == "0" ]]; then
-        return
-    fi
     iptables -D INPUT -i $WIFI_INTERFACE -p udp --dport $ZERONET_PORT -j ACCEPT
     iptables -D INPUT -i $WIFI_INTERFACE -p tcp --dport $ZERONET_PORT -j ACCEPT
     iptables -D INPUT -i $WIFI_INTERFACE -p udp --dport $TRACKER_PORT -j ACCEPT