Cleaning up in accord with Inspection.