[BRANCH] site.yml cleanup