Further changes for removing yaml file.
Tidy.