Kill model traits

The traits don't really add anything, since the models have no logic in them.