Refactor to remove redundant code

No match.