Removed last getModels() calls
Merge pull request #11 from mduplouy/refactoring

Removed last getModels() calls