Cleaned up old reports forms.
Reports mostly working