sultan_defconfig: general update/cleanup