Cleanup models
Merge pull request #187 from sergeyklay/v0.9.9.2

Cleanup models