Cleanup schema items
Merge branch 'hotfix/schema'