diff --git a/roles/6-generic-apps/tasks/main.yml b/roles/6-generic-apps/tasks/main.yml
index 5f1d94269..054044149 100644
--- a/roles/6-generic-apps/tasks/main.yml
+++ b/roles/6-generic-apps/tasks/main.yml
@@ -7,75 +7,63 @@
   include_role:
     name: azuracast
   when: azuracast_install | bool
-  #tags: azuracast
 
 # UNMAINTAINED
 - name: DOKUWIKI
   include_role:
     name: dokuwiki
   when: dokuwiki_install | bool
-  #tags: dokuwiki
 
 # UNMAINTAINED
 - name: EJABBERD
   include_role:
     name: ejabberd
   when: ejabberd_install | bool
-  #tags: ejabberd
 
 - name: ELGG
   include_role:
     name: elgg
   when: elgg_install | bool
-  #tags: elgg
 
 - name: GITEA
   include_role:
     name: gitea
   when: gitea_install | bool
-  #tags: gitea
 
 - name: LOKOLE
   include_role:
     name: lokole
   when: lokole_install | bool
-  #tags: lokole
 
 - name: MEDIAWIKI
   include_role:
     name: mediawiki
   when: mediawiki_install | bool
-  #tags: mediawiki
 
 - name: MOSQUITTO
   include_role:
     name: mosquitto
   when: mosquitto_install | bool
-  #tags: mosquitto
 
 - name: NODE-RED
   include_role:
     name: nodered
   when: nodered_install | bool
-  #tags: nodered
 
 - name: NEXTCLOUD
   include_role:
     name: nextcloud
   when: nextcloud_install | bool
-  #tags: nextcloud
 
 - name: PBX
   include_role:
     name: pbx
   when: pbx_install | bool
-  #tags: pbx  
 
 - name: WORDPRESS
   include_role:
     name: wordpress
   when: wordpress_install | bool
-  #tags: wordpress
 
 - name: Recording STAGE 6 HAS COMPLETED ====================
   lineinfile: