Remove pointless else if