More kconfig cleanups: