Merge "Remove dead 'if'"