Defconfig cleanup