CAD cleanup