Removed unneeded yaml file settings.
Merged.