defconfig cleanup