Remove more SLHC references in the config. This goes to 23.0 to avoid merge conflicts as it's actually touching non-upgrade config.
/cc @tstreble @jmasik @dshope @pagessin @lgagnon