Final tune up for cad cleanup