Remove aliases from Model

As per the discussion in #184.