Clean up diagnostic junk