Adding auto defect clearance