Update model.

Removes timer y.
Removes branches to generalize to model.é