Getting rid of the yaml nonsense