diff --git a/cfg/net/ip6_nf.cfg b/cfg/net/ip6_nf.cfg
index 39e84172fdc4786b2d347255182cdd26740074df..6a0f34c67810e349bd9039c932f66773b8b51d71 100644
--- a/cfg/net/ip6_nf.cfg
+++ b/cfg/net/ip6_nf.cfg
@@ -7,10 +7,8 @@ CONFIG_IP6_NF_MATCH_RT=m
 CONFIG_IP6_NF_MATCH_OPTS=m
 CONFIG_IP6_NF_MATCH_FRAG=m
 CONFIG_IP6_NF_MATCH_HL=m
-CONFIG_IP6_NF_MATCH_OWNER=m
 CONFIG_IP6_NF_MATCH_IPV6HEADER=m
 CONFIG_IP6_NF_MATCH_EUI64=m
 CONFIG_IP6_NF_FILTER=m
-CONFIG_IP6_NF_TARGET_LOG=m
 CONFIG_IP6_NF_MANGLE=m
 CONFIG_IP6_NF_RAW=m
diff --git a/cfg/net/ip_nf.cfg b/cfg/net/ip_nf.cfg
index 24df370db66821302940468956f97d942af0544c..b806fc1d253e87b8db562566b29cc13d47e4b220 100644
--- a/cfg/net/ip_nf.cfg
+++ b/cfg/net/ip_nf.cfg
@@ -8,41 +8,18 @@ index a6a3d92..a392c7d 100644
 #
 CONFIG_IP_NF_QUEUE=m
 CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MATCH_IPRANGE=m
-CONFIG_IP_NF_MATCH_TOS=m
-CONFIG_IP_NF_MATCH_RECENT=m
 CONFIG_IP_NF_MATCH_ECN=m
 CONFIG_IP_NF_MATCH_TTL=m
-CONFIG_IP_NF_MATCH_OWNER=m
-CONFIG_IP_NF_MATCH_ADDRTYPE=m
 CONFIG_IP_NF_FILTER=m
 CONFIG_IP_NF_TARGET_REJECT=m
-CONFIG_IP_NF_TARGET_LOG=m
 CONFIG_IP_NF_TARGET_ULOG=m
 CONFIG_IP_NF_TARGET_MASQUERADE=m
 CONFIG_IP_NF_TARGET_REDIRECT=m
 CONFIG_IP_NF_TARGET_NETMAP=m
-CONFIG_IP_NF_TARGET_SAME=m
 CONFIG_IP_NF_MANGLE=m
-CONFIG_IP_NF_TARGET_TOS=m
 CONFIG_IP_NF_TARGET_ECN=m
 CONFIG_IP_NF_TARGET_CLUSTERIP=m
 CONFIG_IP_NF_RAW=m
 CONFIG_IP_NF_ARPTABLES=m
 CONFIG_IP_NF_ARPFILTER=m
 CONFIG_IP_NF_ARP_MANGLE=m
-CONFIG_IP_NF_AMANDA=m
-CONFIG_IP_NF_CONNTRACK=m
-CONFIG_IP_NF_CONNTRACK_MARK=y
-CONFIG_IP_NF_CT_ACCT=y
-CONFIG_IP_NF_CT_PROTO_SCTP=m
-CONFIG_IP_NF_FTP=m
-CONFIG_IP_NF_IRC=m
-CONFIG_IP_NF_NAT_AMANDA=m
-CONFIG_IP_NF_NAT_FTP=m
-CONFIG_IP_NF_NAT_IRC=m
-CONFIG_IP_NF_NAT=m
-CONFIG_IP_NF_NAT_NEEDED=y
-CONFIG_IP_NF_NAT_SNMP_BASIC=m
-CONFIG_IP_NF_NAT_TFTP=m
-CONFIG_IP_NF_TFTP=m
diff --git a/features/kgdb/kgdb.cfg b/features/kgdb/kgdb.cfg
index f056475e6a81b71fefba4d0b187e7169796ed00b..a51a480a557d13a63d3a7891f5c457eb71cb1c6c 100644
--- a/features/kgdb/kgdb.cfg
+++ b/features/kgdb/kgdb.cfg
@@ -11,10 +11,6 @@
 #
 #.........................................................................
 CONFIG_KGDB=y
-CONFIG_KGDB_ONLY_MODULES=y
-CONFIG_KGDBOE=m
 CONFIG_NETPOLL=y
-# CONFIG_KGDBOE_NOMODULE is not set
-# CONFIG_KGDB_CONSOLE is not set
 
 CONFIG_KGDB_KDB=y
diff --git a/features/lttng/lttng.cfg b/features/lttng/lttng.cfg
index 7462160ad08ad24b50ea0f77d98ea1be10c80580..510725c37a8ec20f92adf766e9b677c52675749d 100644
--- a/features/lttng/lttng.cfg
+++ b/features/lttng/lttng.cfg
@@ -1,3 +1 @@
-CONFIG_MARKERS=y
-CONFIG_MARKERS_DISABLE_OPTIMIZATION=y
 CONFIG_TRACEPOINTS=y
diff --git a/features/net_sched/net_sched.cfg b/features/net_sched/net_sched.cfg
index 686bc1e8d67cb7d2d26b37665efaaab342ffb813..6960b02266ea13454e148b7ffabfcc02d3865b27 100644
--- a/features/net_sched/net_sched.cfg
+++ b/features/net_sched/net_sched.cfg
@@ -2,9 +2,6 @@
 # QoS and/or fair queueing
 #
 CONFIG_NET_SCHED=y
-CONFIG_NET_SCH_CLK_JIFFIES=y
-# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set
-# CONFIG_NET_SCH_CLK_CPU is not set
 
 #
 # Queueing/Scheduling
diff --git a/features/netfilter/netfilter.cfg b/features/netfilter/netfilter.cfg
index ebe362ed65a50bd8416145ec9062f733261688db..192401796d35b319b5f4e379d67f2ea87001e4cd 100644
--- a/features/netfilter/netfilter.cfg
+++ b/features/netfilter/netfilter.cfg
@@ -11,7 +11,6 @@ CONFIG_NETFILTER_NETLINK=m
 CONFIG_NETFILTER_NETLINK_QUEUE=m
 CONFIG_NETFILTER_NETLINK_LOG=m
 CONFIG_NF_CONNTRACK=m
-CONFIG_NF_CT_ACCT=y
 CONFIG_NF_CONNTRACK_MARK=y
 CONFIG_NF_CT_PROTO_GRE=m
 CONFIG_NF_CT_PROTO_SCTP=m
@@ -72,13 +71,11 @@ CONFIG_NF_CONNTRACK_IPV4=m
 CONFIG_NF_CONNTRACK_PROC_COMPAT=y
 CONFIG_IP_NF_QUEUE=m
 CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MATCH_ADDRTYPE=m
 CONFIG_IP_NF_MATCH_AH=m
 CONFIG_IP_NF_MATCH_ECN=m
 CONFIG_IP_NF_MATCH_TTL=m
 CONFIG_IP_NF_FILTER=m
 CONFIG_IP_NF_TARGET_REJECT=m
-CONFIG_IP_NF_TARGET_LOG=m
 CONFIG_IP_NF_TARGET_ULOG=m
 CONFIG_NF_NAT=m
 CONFIG_NF_NAT_NEEDED=y
@@ -104,6 +101,5 @@ CONFIG_IP_NF_RAW=m
 CONFIG_IP_NF_ARPTABLES=m
 CONFIG_IP_NF_ARPFILTER=m
 CONFIG_IP_NF_ARP_MANGLE=m
-CONFIG_NET_CLS_ROUTE=y
 
 CONFIG_NET_SCHED=y
diff --git a/features/uprobe/uprobe.cfg b/features/uprobe/uprobe.cfg
index 931556f3f06721df910ee2a832371f4d6f84f2dd..ba58ff2203e4f68c706219f3b635e4f8e3afac90 100644
--- a/features/uprobe/uprobe.cfg
+++ b/features/uprobe/uprobe.cfg
@@ -1,3 +1 @@
-CONFIG_UPROBES=y
-CONFIG_UPROBE_EVENT=y
 CONFIG_PERF_EVENTS=y
diff --git a/features/utrace/utrace.cfg b/features/utrace/utrace.cfg
index bf85aa2cdc666a497d15e2c209b6fdd5b1e03369..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
--- a/features/utrace/utrace.cfg
+++ b/features/utrace/utrace.cfg
@@ -1 +0,0 @@
-CONFIG_UTRACE=y
diff --git a/ktypes/base/base.cfg b/ktypes/base/base.cfg
index 7170f27ca245930f7422185073a6cbff327216a4..6fa310f154c72307d2158c200c1bdd3c829768ac 100644
--- a/ktypes/base/base.cfg
+++ b/ktypes/base/base.cfg
@@ -15,7 +15,6 @@
 # Code maturity level options
 #
 CONFIG_EXPERIMENTAL=y
-CONFIG_LOCK_KERNEL=y
 
 #
 # General setup
@@ -38,7 +37,6 @@ CONFIG_SYSCTL=y
 CONFIG_EMBEDDED=y
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_ALL is not set
-# CONFIG_KALLSYMS_EXTRA_PASS is not set
 CONFIG_HOTPLUG=y
 CONFIG_FUTEX=y
 CONFIG_EPOLL=y
@@ -48,7 +46,6 @@ CONFIG_EPOLL=y
 #
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
-CONFIG_KMOD=y
 CONFIG_BLOCK=y
 
 #
@@ -58,13 +55,11 @@ CONFIG_BLOCK=y
 #
 # Block layer
 #
-# CONFIG_LBD is not set
 
 #
 # IO Schedulers
 #
 CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_AS=y
 CONFIG_IOSCHED_DEADLINE=y
 CONFIG_IOSCHED_CFQ=y
 
@@ -124,7 +119,6 @@ CONFIG_NET=y
 # Networking options
 #
 CONFIG_PACKET=y
-CONFIG_PACKET_MMAP=y
 CONFIG_UNIX=y
 CONFIG_XFRM=y
 CONFIG_INET=y
@@ -437,7 +431,6 @@ CONFIG_NETDEVICES=y
 #
 # Ethernet (10 or 100Mbit)
 #
-CONFIG_NET_ETHERNET=y
 
 #
 # Tulip family network device support
@@ -944,7 +937,6 @@ CONFIG_PROC_KCORE=y
 CONFIG_SYSFS=y
 CONFIG_TMPFS=y
 # CONFIG_HUGETLB_PAGE is not set
-CONFIG_RAMFS=y
 
 #
 # Layered filesystems
@@ -974,9 +966,7 @@ CONFIG_RAMFS=y
 CONFIG_NFS_FS=y
 CONFIG_NFS_V3=y
 CONFIG_NFS_V4=y
-CONFIG_NFS_DIRECTIO=y
 CONFIG_NFSD_V3=y
-CONFIG_NFSD_TCP=y
 CONFIG_ROOT_NFS=y
 CONFIG_LOCKD=y
 CONFIG_LOCKD_V4=y
diff --git a/ktypes/base/non-hardware.cfg b/ktypes/base/non-hardware.cfg
index d1b894c4cda46d80d87d50719629bc49437f2432..1c58ef251ac922eeb62742cd63d14876d21f6056 100644
--- a/ktypes/base/non-hardware.cfg
+++ b/ktypes/base/non-hardware.cfg
@@ -20,7 +20,6 @@ CONFIG_PREEMPT
 CONFIG_NET
 CONFIG_NETCONSOLE
 CONFIG_NETDEVICES
-CONFIG_NET_ETHERNET
 
 CONFIG_TUN
 CONFIG_BONDING
diff --git a/ktypes/preempt-rt/preempt-rt.cfg b/ktypes/preempt-rt/preempt-rt.cfg
index 931482085876d90adea52fab315a7b0a4ab7d524..451c24c4d77853da31d1415699a2f1b3ef2c573c 100644
--- a/ktypes/preempt-rt/preempt-rt.cfg
+++ b/ktypes/preempt-rt/preempt-rt.cfg
@@ -338,7 +338,6 @@ CONFIG_BLK_DEV_NBD=m
 #
 # SCSI low-level drivers
 #
-# CONFIG_SCSI_QLOGIC_FC is not set
 
 #
 # PCMCIA SCSI adapter support
@@ -356,7 +355,6 @@ CONFIG_BLK_DEV_MD=y
 CONFIG_MD_LINEAR=y
 CONFIG_MD_RAID0=y
 CONFIG_MD_RAID1=y
-CONFIG_MD_RAID5=y
 CONFIG_MD_RAID10=y
 CONFIG_MD_MULTIPATH=y
 CONFIG_MD_FAULTY=y
@@ -921,13 +919,11 @@ CONFIG_REISERFS_FS_POSIX_ACL=y
 # CONFIG_REISERFS_FS_SECURITY is not set
 # CONFIG_JFS_FS is not set
 CONFIG_FS_POSIX_ACL=y
-# CONFIG_XFS_SECURITY is not set
 # CONFIG_XFS_RT is not set
 # CONFIG_OCFS2_FS is not set
 CONFIG_MINIX_FS=m
 CONFIG_ROMFS_FS=m
 # CONFIG_QUOTA is not set
-CONFIG_AUTOFS_FS=m
 CONFIG_AUTOFS4_FS=m
 
 #
@@ -960,14 +956,10 @@ CONFIG_CONFIGFS_FS=m
 #
 # Network File Systems
 #
-CONFIG_SMB_FS=m
-CONFIG_SMB_NLS_DEFAULT=y
-CONFIG_SMB_NLS_REMOTE="cp437"
 CONFIG_CIFS=m
 # CONFIG_CIFS_STATS is not set
 CONFIG_CIFS_XATTR=y
 CONFIG_CIFS_POSIX=y
-# CONFIG_CIFS_EXPERIMENTAL is not set
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
@@ -1099,7 +1091,6 @@ CONFIG_NLS_UTF8=m
 #
 CONFIG_SECURITY=y
 # CONFIG_SECURITY_NETWORK is not set
-CONFIG_SECURITY_CAPABILITIES=y
 # CONFIG_SECURITY_SELINUX is not set
 
 #
diff --git a/ktypes/standard/standard.cfg b/ktypes/standard/standard.cfg
index b396d1d92c48cb42fb4903ee80fe974c3a516a32..f58c915028a3f6fe497f5e10c6b32b18d7efcde3 100644
--- a/ktypes/standard/standard.cfg
+++ b/ktypes/standard/standard.cfg
@@ -331,7 +331,6 @@ CONFIG_BLK_DEV_NBD=m
 #
 # SCSI low-level drivers
 #
-# CONFIG_SCSI_QLOGIC_FC is not set
 
 #
 # PCMCIA SCSI adapter support
@@ -349,7 +348,6 @@ CONFIG_BLK_DEV_MD=y
 CONFIG_MD_LINEAR=y
 CONFIG_MD_RAID0=y
 CONFIG_MD_RAID1=y
-CONFIG_MD_RAID5=y
 CONFIG_MD_RAID10=y
 CONFIG_MD_MULTIPATH=y
 CONFIG_MD_FAULTY=y
@@ -914,13 +912,11 @@ CONFIG_REISERFS_FS_POSIX_ACL=y
 # CONFIG_REISERFS_FS_SECURITY is not set
 # CONFIG_JFS_FS is not set
 CONFIG_FS_POSIX_ACL=y
-# CONFIG_XFS_SECURITY is not set
 # CONFIG_XFS_RT is not set
 # CONFIG_OCFS2_FS is not set
 CONFIG_MINIX_FS=m
 CONFIG_ROMFS_FS=m
 # CONFIG_QUOTA is not set
-CONFIG_AUTOFS_FS=m
 CONFIG_AUTOFS4_FS=m
 
 #
@@ -950,14 +946,10 @@ CONFIG_CONFIGFS_FS=m
 #
 # Network File Systems
 #
-CONFIG_SMB_FS=m
-CONFIG_SMB_NLS_DEFAULT=y
-CONFIG_SMB_NLS_REMOTE="cp437"
 CONFIG_CIFS=m
 # CONFIG_CIFS_STATS is not set
 CONFIG_CIFS_XATTR=y
 CONFIG_CIFS_POSIX=y
-# CONFIG_CIFS_EXPERIMENTAL is not set
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
@@ -1089,7 +1081,6 @@ CONFIG_NLS_UTF8=m
 #
 CONFIG_SECURITY=y
 # CONFIG_SECURITY_NETWORK is not set
-CONFIG_SECURITY_CAPABILITIES=y
 # CONFIG_SECURITY_SELINUX is not set
 
 #