update defconfig & more clean up