Updated model utils (cleanup)
8 files changed