HomeReports - Further clean up