Cleaned up some Kconfigs for better looking make defconfig