Tidying

src/freedombone-app-babel

 }
 
 function remove_babel {
-    if ! grep -Fxq "install_babel" $COMPLETION_FILE; then
+    if [[ $(app_is_installed babel) == "0" ]]; then
         return
     fi
 

src/freedombone-app-batman

 }
 
 function remove_batman {
-    if ! grep -Fxq "install_batman" $COMPLETION_FILE; then
+    if [[ $(app_is_installed batman) == "0" ]]; then
         return
     fi
 

src/freedombone-app-blog

 }
 
 function remove_blog {
-    if ! grep -Fxq "install_blog" $COMPLETION_FILE; then
+    if [[ $(app_is_installed blog) == "0" ]]; then
         return
     fi
     if [ ! -d /var/www/$FULLBLOG_DOMAIN_NAME ]; then

src/freedombone-app-cjdns

 }
 
 function remove_cjdns {
-    if ! grep -Fxq "install_cjdns" $COMPLETION_FILE; then
+    if [[ $(app_is_installed cjdns) == "0" ]]; then
         return
     fi
     service cjdns stop

src/freedombone-app-dlna

 }
 
 function remove_dlna {
-    if ! grep -Fxq "install_dlna" $COMPLETION_FILE; then
+    if [[ $(app_is_installed dlna) == "0" ]]; then
         return
     fi
     service minidlna stop

src/freedombone-app-emacs

 }
 
 function remove_emacs {
-    if ! grep -Fxq "install_emacs" $COMPLETION_FILE; then
+    if [[ $(app_is_installed emacs) == "0" ]]; then
         return
     fi
     apt-get -y remove --purge emacs24

src/freedombone-app-gnusocial

 }
 
 function remove_gnusocial {
-    if ! grep -Fxq "install_gnusocial" $COMPLETION_FILE; then
+    if [[ $(app_is_installed gnusocial) == "0" ]]; then
         return
     fi
     nginx_dissite $MICROBLOG_DOMAIN_NAME

src/freedombone-app-gogs

 }
 
 function remove_gogs {
-    if ! grep -Fxq "install_gogs" $COMPLETION_FILE; then
+    if [[ $(app_is_installed gogs) == "0" ]]; then
         return
     fi
 

src/freedombone-app-hubzilla

 }
 
 function remove_hubzilla {
-    if ! grep -Fxq "Hubzilla domain" $COMPLETION_FILE; then
+    if [[ $(app_is_installed hubzilla) == "0" ]]; then
         return
     fi
     echo $'Removing Hubzilla'

src/freedombone-app-ipfs

 }
 
 function remove_ipfs_go {
-    if ! grep -Fxq "install_ipfs_go" $COMPLETION_FILE; then
+    if [[ $(app_is_installed ipfs_go) == "0" ]]; then
         return
     fi
     systemctl stop ipfs
 }
 
 function remove_ipfs_js {
-    if ! grep -Fxq "install_ipfs_js" $COMPLETION_FILE; then
+    if [[ $(app_is_installed ipfs_js) == "0" ]]; then
         return
     fi
     systemctl stop ipfs

src/freedombone-app-irc

 }
 
 function remove_irc {
-    if ! grep -Fxq "install_irc" $COMPLETION_FILE; then
+    if [[ $(app_is_installed irc) == "0" ]]; then
         return
     fi
     systemctl stop ngircd

src/freedombone-app-librevault

 }
 
 function remove_librevault {
-    if ! grep -Fxq "install_librevault" $COMPLETION_FILE; then
+    if [[ $(app_is_installed librevault) == "0" ]]; then
         return
     fi
     iptables -D INPUT -p udp --dport $LIBREVAULT_PORT -j ACCEPT

src/freedombone-app-mumble

 }
 
 function remove_mumble {
-    if !grep -Fxq "install_mumble" $COMPLETION_FILE; then
-        if ! grep -Fxq "install_voip" $COMPLETION_FILE; then
-            return
-        fi
+    if [[ $(app_is_installed mumble) == "0" ]]; then
+        return
     fi
     apt-get -y remove --purge mumble-server
     if [[ $ONION_ONLY == "no" ]]; then

src/freedombone-app-rss

 }
 
 function remove_rss {
-    if ! grep -Fxq "install_rss" $COMPLETION_FILE; then
+    if [[ $(app_is_installed rss) == "0" ]]; then
         return
     fi
     nginx_dissite $RSS_READER_DOMAIN_NAME

src/freedombone-app-searx

 }
 
 function remove_searx {
-    if ! grep -Fxq "install_searx" $COMPLETION_FILE; then
+    if [[ $(app_is_installed searx) == "0" ]]; then
         return
     fi
     systemctl stop searx

src/freedombone-app-sip

 }
 
 function remove_sip {
-    if ! grep -Fxq "install_sip" $COMPLETION_FILE; then
+    if [[ $(app_is_installed sip) == "0" ]]; then
         return
     fi
     iptables -D INPUT -p udp --dport $VOIP_TURN_PORT -j ACCEPT

src/freedombone-app-tahoelafs

 }
 
 function remove_tahoelafs {
-    if ! grep -Fxq "install_tahoelafs" $COMPLETION_FILE; then
+    if [[ $(app_is_installed tahoelafs) == "0" ]]; then
         return
     fi
     iptables -D INPUT -p udp --dport $TAHOELAFS_PORT -j ACCEPT

src/freedombone-app-tox

 }
 
 function remove_tox_node {
-    if ! grep -Fxq "install_tox_node" $COMPLETION_FILE; then
+    if [[ $(app_is_installed tox_node) == "0" ]]; then
         return
     fi
 
 }
 
 function remove_tox_avahi {
-    if ! grep -Fxq "tox_avahi" $COMPLETION_FILE; then
+    if [[ $(app_is_installed tox_avahi) == "0" ]]; then
         return
     fi
     cd $INSTALL_DIR/toxid
 }
 
 function remove_tox_client {
-    if ! grep -Fxq "install_tox_client" $COMPLETION_FILE; then
+    if [[ $(app_is_installed tox_client) == "0" ]]; then
         return
     fi
 

src/freedombone-app-webmail

 }
 
 function remove_webmail {
-    if ! grep -Fxq "install_webmail" $COMPLETION_FILE; then
+    if [[ $(app_is_installed webmail) == "0" ]]; then
         return
     fi
     nginx_dissite webmail

src/freedombone-app-wiki

 }
 
 function remove_wiki {
-    if ! grep -Fxq "install_wiki" $COMPLETION_FILE; then
+    if [[ $(app_is_installed wiki) == "0" ]]; then
         return
     fi
     function_check remove_onion_service

src/freedombone-app-xmpp

 }
 
 function remove_xmpp_client {
-    if ! grep -Fxq "install_xmpp_client" $COMPLETION_FILE; then
+    if [[ $(app_is_installed xmpp_client) == "0" ]]; then
         return
     fi
     apt-get -y remove --purge profanity
 
 function remove_xmpp {
     remove_xmpp_client
-    if ! grep -Fxq "install_xmpp" $COMPLETION_FILE; then
+    if [[ $(app_is_installed xmpp) == "0" ]]; then
         return
     fi
     iptables -D INPUT -p tcp --dport 5222:5223 -j ACCEPT

src/freedombone-app-zeronet

 }
 
 function remove_zeronet_blog {
-    if ! grep -Fxq "install_zeronet_blog" $COMPLETION_FILE; then
+    if [[ $(app_is_installed zeronet_blog) == "0" ]]; then
         return
     fi
     if [ -d $MESH_INSTALL_DIR/zeronet/ZeroBlog ]; then
 }
 
 function remove_zeronet_mail {
-    if ! grep -Fxq "install_zeronet_mail" $COMPLETION_FILE; then
+    if [[ $(app_is_installed zeronet_mail) == "0" ]]; then
         return
     fi
     if [ -d $MESH_INSTALL_DIR/zeronet/ZeroMail ]; then
 }
 
 function remove_zeronet_forum {
-    if ! grep -Fxq "install_zeronet_forum" $COMPLETION_FILE; then
+    if [[ $(app_is_installed zeronet_forum) == "0" ]]; then
         return
     fi
     if [ -d $MESH_INSTALL_DIR/zeronet/ZeroTalk ]; then
     remove_zeronet_blog
     remove_zeronet_mail
     remove_zeronet_forum
-    if ! grep -Fxq "install_zeronet" $COMPLETION_FILE; then
+    if [[ $(app_is_installed zeronet) == "0" ]]; then
         return
     fi
     iptables -D INPUT -i $WIFI_INTERFACE -p udp --dport $ZERONET_PORT -j ACCEPT