Refactoring - remove not used ModelUtils