Removed measurement model and regenerated code
122 files changed