Defconfig clean up