More aggressively clean up results, fix PR cleanups