Deleted SampleModel
Merge branch 'develop'