Bit of config cleanup
Merge branch 'db-yml-cleanup'