Cleanup, need to sort out report generation