Feature/clean models

- Feature/clean models