Splitting out to global and local
Removing global config