Stripped out all the yaml stuff