work in progress
Merge branch 'develop' into temp
don't know, I missed it
remove unused old schema files