Cleanup diagnostic