Trying to fix double reports (also, ton of cleanup)