[WIP] More config cleanups

:construction: 
cc @icewind1991 @DeepDiver1975 @PVince81 @LukasReschke 
Can this be injected instead of being grabbed from global OC::