remove some calls to intern