Cleanup and using hiera_hash for db_config