Get rid of yaml for good