Merge branch 'hotfix/schema'
Cleanup schema items I missed the first time.
Merge branch 'hotfix/schema' into develop