Remove aliases from Model

- Closes #184