Sultan_defconfig: Refresh & minor clean-up