Remove stray code duplication