Remove some duplication - not sure how that happened