Let's clean up this config..