remove yet more duplication