Diagnositic tool cleanup.