clean up and fix parts of the orm module

- remove old commented-out models
- add some data fields for extra colls