remove references to raw