Feature/clean models

- clean up models