Remove other duplicate definitions from merge

The last HA merge brought in a couple of duplicate definitions.
This removes them.