Remove redundant includes of common.yml