Get rid of proprietary Avenir.