remove some more __