Issue #667 cleaning models