Major defconfig cleanup