merge fix

Rm duplicated dispatch fn.
Reverted models.py.

@quamilek