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