Merge pull request #1247 from bradymiller/clinical-reports-cleanup_1