replace more uses of global config