diff --git a/modules-mls.conf b/modules-mls.conf
index 625ce6a..3034d00 100644
--- a/modules-mls.conf
+++ b/modules-mls.conf
@@ -1308,13 +1308,6 @@ pegasus = module
 pingd = module
 
 # Layer: services
-# Module: piranha
-#
-# piranha - various tools to administer and configure the Linux Virtual Server
-# 
-piranha = module
- 
-# Layer: services
 # Module: plymouthd
 #
 #  Plymouth
diff --git a/modules-targeted.conf b/modules-targeted.conf
index bc5edff..a84cf14 100644
--- a/modules-targeted.conf
+++ b/modules-targeted.conf
@@ -433,13 +433,6 @@ aiccu = module
 # 
 aide = module
  
-# Layer: services
-# Module: ajaxterm
-#
-# Web Based Terminal
-# 
-ajaxterm = module
-
 # Layer: admin
 # Module: alsa
 #
@@ -510,13 +503,6 @@ arpwatch = module
 # 
 asterisk = module
 
-# Layer: contrib
-# Module: authconfig
-#
-# Authorization configuration tool
-# 
-authconfig = module
-
 # Layer: services
 # Module: automount
 #
@@ -602,13 +588,6 @@ brctl = module
 bugzilla = module
 
 # Layer: services
-# Module: bumblebee
-#
-# Support NVIDIA Optimus technology under Linux
-#
-bumblebee = module
-
-# Layer: services
 # Module: cachefilesd
 #
 # CacheFiles userspace management daemon
@@ -925,13 +904,6 @@ dhcp = module
 dictd = module
 
 # Layer: services
-# Module: dirsrv-admin
-#
-#  An 309 directory admin server
-# 
-dirsrv-admin = module
-
-# Layer: services
 # Module: dirsrv
 #
 #  An 309 directory server
@@ -1436,13 +1408,6 @@ memcached = module
 milter = module
 
 # Layer: services
-# Module: mip6d
-#
-# UMIP Mobile IPv6 and NEMO Basic Support protocol implementation
-#
-mip6d = module
-
-# Layer: services
 # Module: mock
 #
 # Policy for mock rpm builder
@@ -1753,13 +1718,6 @@ pegasus = module
 # 
 pingd = module
 
-# Layer: services
-# Module: piranha
-#
-# piranha - various tools to administer and configure the Linux Virtual Server
-#
-piranha = module
-
 # Layer: contrib
 # Module: pkcs
 #  
@@ -2166,13 +2124,6 @@ sensord =  module
 # 
 setroubleshoot = module
 
-# Layer: services
-# Module: sge
-# 
-#  policy for grindengine MPI jobs
-#
-sge = module
-
 # Layer: admin
 # Module: shorewall
 #
@@ -2641,13 +2592,6 @@ mandb = module
 #
 pki = module
 
-# Layer: services
-# Module: smsd
-#
-# policy for smsd
-#
-smsd = module
-
 # Layer: contrib
 # Module: pesign
 #
@@ -2761,13 +2705,6 @@ minissdpd = module
 freeipmi = module
 
 # Layer: contrib
-# Module: mirrormanager
-# 
-# mirrormanager policy
-#
-mirrormanager = module
-
-# Layer: contrib
 # Module: snapper 
 # 
 # snapper policy
@@ -2826,21 +2763,6 @@ mongodb = module
 iotop = module
 
 # Layer: contrib
-# Module: kmscon
-#
-# kmscon policy
-#
-
-kmscon = module
-
-# Layer: contrib
-# Module: naemon
-#
-# naemon policy
-#
-naemon = module
-
-# Layer: contrib
 # Module: brltty
 #
 # brltty policy
@@ -2876,13 +2798,6 @@ cinder = module
 linuxptp = module
 
 # Layer: contrib
-# Module: rolekit
-#
-# rolekit policy
-#
-rolekit = module
-
-# Layer: contrib
 # Module: targetd
 #
 # targetd policy
@@ -2904,13 +2819,6 @@ hsqldb = module
 blkmapd = module
 
 # Layer: contrib
-# Module: pkcs11proxyd
-#
-# pkcs11proxyd policy
-#
-pkcs11proxyd = module
-
-# Layer: contrib
 # Module: ipmievd
 #
 # IPMI event daemon for sending events to syslog
@@ -2939,13 +2847,6 @@ fwupd = module
 lttng-tools = module
 
 # Layer: contrib
-# Module: rkt
-#
-# CLI for running app containers
-#
-rkt = module
-
-# Layer: contrib
 # Module: opendnssec
 #
 # opendnssec
@@ -3016,13 +2917,6 @@ boltd = module
 kpatch = module
 
 # Layer: contrib
-# Module: timedatex
-#
-# timedatex
-#
-timedatex = module
-
-# Layer: contrib
 # Module: rrdcached
 #
 # rrdcached