Cleanup YAML matter