Code cleanup: Removed class ModelFinder and reorganized its methods into
other utility classes.
25 files changed