defconfig clean up