* Cleanup and standard config merge