update defconfig and clean up from local testing.