rebase defconfig and clean up