fixup: remove duplication