clenup model methods
Merge pull request #42 from zendesk/grosser/cleanup

clenup model methods