More defconfig cleanup