Merge pull request #1253 from bradymiller/cleanup-clinic-reports