Remove schema.org references to simplify markup
Merge branch 'hotfix/schema'