fix up and clean up defconfig