Updates covmodel reference, adds cleanup
Includes the merge commit for covmodel
Merge pull request #1336 from lukecampbell/covmodel-cleanup

Updates covmodel reference, adds cleanup