Revert "new collections -- WIP"

This reverts commit 7507f6709f8ec43de2f82960d803803c42167277.
Revert "more model changes"

This reverts commit d5e024386d4f0dd91c61b1b11a1678721bc8c666.