diff --git a/modules-targeted-base.conf b/modules-targeted-base.conf
index 4447a262..0ab4cfde 100644
--- a/modules-targeted-base.conf
+++ b/modules-targeted-base.conf
@@ -190,20 +190,12 @@ secadm = module
 # 
 sysadm_secadm = module
 
-
 # Module: staff
 #
 # admin account 
 # 
 staff = module
 
-# Layer:role
-# Module: sysadm_secadm
-#
-# System Administrator with Security Admin rules
-# 
-sysadm_secadm = module
-
 # Layer:role
 # Module: sysadm
 #
@@ -239,13 +231,6 @@ postgresql = module
 # 
 ssh = module
 
-# Layer: apps
-# Module: rssh
-#
-#  Restricted (scp/sftp) only shell
-# 
-rssh = module
-
 # Layer: services
 # Module: xserver
 #
@@ -344,13 +329,6 @@ logging = module
 # 
 lvm = module
 
-# Layer: system
-# Module: miscfiles
-#
-# Miscelaneous files.
-# 
-miscfiles = module
-
 # Layer: system
 # Module: modutils
 #
@@ -358,13 +336,6 @@ miscfiles = module
 # 
 modutils = module
 
-# Layer: services
-# Module: automount
-#
-# Filesystem automounter service.
-# 
-automount = module
-
 # Layer: system
 # Module: mount
 #
@@ -421,10 +392,3 @@ udev = module
 # 
 unconfined = module
 
-# Layer: system
-# Module: userdomain
-#
-# Policy for user domains
-# 
-userdomain = module
-
diff --git a/modules-targeted-contrib.conf b/modules-targeted-contrib.conf
index 95cf1921..a2e27729 100644
--- a/modules-targeted-contrib.conf
+++ b/modules-targeted-contrib.conf
@@ -159,13 +159,6 @@ bcfg2 = module
 # 
 bind = module
 
-# Layer: services
-# Module: rpcbind
-#
-#  universal addresses to RPC program number mapper
-# 
-rpcbind = module
-
 # Layer: contrib
 # Module: rngd
 #
@@ -699,13 +692,6 @@ freqset = module
 # 
 ftp = module
 
-# Layer: services
-# Module: tftp
-#
-# Trivial file transfer protocol daemon
-# 
-tftp = module
-
 # Layer: apps
 # Module: games
 #
@@ -755,13 +741,6 @@ gnome = module
 # 
 gpg = module
 
-# Layer: apps
-# Module: gpg
-#
-# Policy for Mozilla and related web browsers
-# 
-gpg = module
-
 # Layer: services
 # Module: gpm
 #
@@ -972,13 +951,6 @@ ldap = module
 # 
 likewise = module
 
-# Layer: services
-# Module: lircd
-#
-# LIRC daemon - decodes infrared signals and provides them on a Unix domain socket.  
-# 
-lircd = module
-
 # Layer: apps
 # Module: livecd
 #
@@ -1028,13 +1000,6 @@ logwatch = module
 # 
 lpd = module
 
-# Layer: contrib
-# Module: slpd
-#  
-# OpenSLP server daemon to dynamically register services
-#
-slpd = module
-
 # Layer: services
 # Module: mailman
 #
@@ -1112,12 +1077,6 @@ modemmanager = module
 # 
 mojomojo = module
 
-# Layer: services
-# Module: motion
-#
-# Daemon for detect motion using a video4linux device
-motion = module
-
 # Layer: apps
 # Module: mozilla
 #
@@ -1195,13 +1154,6 @@ namespace = module
 # 
 ncftool = module
 
-# Layer: admin
-# Module: ncftool
-#
-# Tool to modify the network configuration of a system
-# 
-ncftool = module
-
 # Layer: services
 # Module: networkmanager
 #
@@ -1492,13 +1444,6 @@ ppp = module
 # 
 prelink = module
 
-unprivuser = module
-
-# Layer: services
-# Module: prelude
-#
-prelude = module
-
 # Layer: services
 # Module: privoxy
 #
@@ -2051,14 +1996,6 @@ tmpreaper = module
 #  policy for tomcat service
 #
 tomcat = module
-
-# Layer: apps
-# Module: cpufreqselector 
-#
-# cpufreqselector executable
-# 
-cpufreqselector = module
-
 # Layer: services
 # Module: tor
 #
@@ -2066,13 +2003,6 @@ cpufreqselector = module
 # 
 tor = module
 
-# Layer: services
-# Module: ksmtuned
-#
-#  Kernel Samepage Merging (KSM) Tuning Daemon
-# 
-ksmtuned = module
-
 # Layer: services
 # Module: tuned
 #
@@ -2213,13 +2143,6 @@ vmware = module
 # 
 vnstatd = module
 
-# Layer: services
-# Module: openvpn
-#
-# Policy for OPENVPN full-featured SSL VPN solution
-# 
-openvpn = module
-
 # Layer: admin
 # Module: vpn
 #
@@ -2276,13 +2199,6 @@ wireshark = module
 # 
 xen = module
 
-# Layer: role
-# Module: xguest
-#
-# Minimally privs guest account on X Windows logins
-# 
-xguest = module
-
 # Layer: services
 # Module: zabbix
 #
@@ -2493,13 +2409,6 @@ pcp = module
 #
 geoclue = module
 
-# Layer: contrib
-# Module: gear
-#
-# Add policy for Geard, for orchistrating containers
-#
-gear = module
-
 # Layer: contrib
 # Module: rkhunter
 #
@@ -2521,13 +2430,6 @@ bacula = module
 #
 rhnsd = module
 
-# Layer: contrib
-# Module: gear
-#
-# gear policy
-#
-gear = module
-
 # Layer: contrib
 # Module: mongodb
 #
@@ -2551,3 +2453,10 @@ iotop = module
 #
 
 kmscon = module
+
+# Layer: contrib
+# Module: gear
+#
+# gear policy
+#
+gear = module