CHECK cleanup