Complete transition to new config system