remove some more duplication