Revert "new math schema"
Revert "new math schema"

reverting since it was pushed to master, but not ready to push

This reverts commit fb79004c4131b8d3b5d8eb239578e375145f7fda.

pol-is/polisServer,pol-is/polisServer,pol-is/polisServer