Add defconfig and clean up