[WIP] More config cleanups

:construction: 
cc @icewind1991 @DeepDiver1975 @PVince81 @LukasReschke 
Crashes the DI and I need to figure out why.... this is still WIP, but thanks for the comment.