Clean up diagnostic junk.