Removing spurious if