Remove unneeded strings from schema
Merge branch 'refactor'
merging schema changes