Revert "Changes to the model"

This reverts commit 7298df9c759feb69a78fa6c6126e9dfcc8945fa3.
changes to model and regenerated code