Kconfig cleanup