Get rid of all cm10-based code