Deduplication

Removed duplicate code and an un-needed conditional.