Remove leftover merge cruft - thanks to Mike Dubman for spotting it