Remove and add some things to defconfig