Get rid of conversion maps