Merge branch '2022-08-04-Kconfig-migrations'

- Further migrations to Kconfig and associated dead code removal.