Small cleaning up of model concerns
Merge pull request #906 from arthurnn/remove_code

Small cleaning up of model concerns