Remove unused code
Add blank line between YAML and content