Add initial model cleanup and fixes#774

forstmeier wants to merge 4 commits intomasteroscmcompany/fund:masterfrom

model-cleanup-and-retrainingoscmcompany/fund:model-cleanup-and-retrainingCopy head branch name to clipboard