Revert "Revert "defconfig: cleanup 1""

This reverts commit fd1c3a6a18eb6708f608e8b53ca2e0023c7c5de9.