remove some stupid typedef and poisonned identifiers