Get rid of C=X