Remove some dead code

This "if" block is repeated. Probably a conflict resolution issue?