More minor cleanups:

1. Fix small typo "retorted ." -> "retorted."
2. Remove from fortunes a story that is duplicated in fortunes2-o
3. Remove from fortunes and fortunes2-o Zippy the Pinhead quotes
that are already in the zippy file.
4. ... therefore remove zippy from fortunes.sp.ok
5. Remove a duplicate in the zippy file.

4 files changed, 1 insertions, 91 deletions

diff --git a/games/fortune/datfiles/fortunes b/games/fortune/datfiles/fortunes
index c98c840d42ff..1efa5db82725 100644
--- a/games/fortune/datfiles/fortunes
+++ b/games/fortune/datfiles/fortunes
@@ -2840,21 +2840,6 @@ explains.
 
 		-- being told in Poland, 1987
 %
-	Joan, the rather well-proportioned secretary, spent almost all of
-her vacation sunbathing on the roof of her hotel.  She wore a bathing suit
-the first day, but on the second, she decided that no one could see her
-way up there, and she slipped out of it for an overall tan.  She'd hardly
-begun when she heard someone running up the stairs; she was lying on her
-stomach, so she just pulled a towel over her rear.
-	"Excuse me, miss," said the flustered little assistant manager of
-the hotel, out of breath from running up the stairs.  "The Hilton doesn't
-mind your sunbathing on the roof, but we would very much appreciate your
-wearing a bathing suit as you did yesterday."
-	"What difference does it make," Joan asked rather calmly.  "No one
-can see me up here, and besides, I'm covered with a towel."
-	"Not exactly," said the embarrassed little man.  "You're lying on
-the dining room skylight."
-%
 	Lassie looked brilliant, in part because the farm family she
 lived with was made up of idiots.  Remember?  One of them was always
 getting pinned under the tractor, and Lassie was always rushing back to
@@ -5504,11 +5489,6 @@ may make mistakes also.  But it is permissible to make a judgment after you
 have examined the evidence.  In some circles it is even encouraged.
 		-- Carl Sagan, "The Burden of Skepticism"
 %
-... bleakness ... desolation ... plastic forks ...
-%
-"... bleakness... desolation... plastic forks..."
-		-- Zippy the Pinhead
-%
 ... But as records of courts and justice are admissible, it can
 easily be proved that powerful and malevolent magicians once existed
 and were a scourge to mankind.  The evidence (including confession)
@@ -6415,9 +6395,6 @@ is to make a copy of everything before he destroys it.
 A businessman is a hybrid of a dancer and a calculator.
 		-- Paul Valery
 %
-"A can of ASPARAGUS, 73 pigeons, some LIVE ammo, and a FROZEN DAIQURI!!"
-		-- Zippy the Pinhead
-%
 A candidate is a person who gets money from the rich
 and votes from the poor to protect them from each other.
 %
@@ -9713,9 +9690,6 @@ All I ask is a chance to prove that money can't make me happy.
 All I ask of life is a constant and exaggerated sense of my own
 importance.
 %
-All I can think of is a platter of organic PRUNE CRISPS being trampled
-by an army of swarthy, Italian LOUNGE SINGERS ...
-%
 All I kin say is when you finds yo'self wanderin' in a peach orchard,
 ya don't go lookin' for rutabagas.
 		-- Kingfish
@@ -15810,9 +15784,6 @@ that's how dogs spend their lives.
 %
 Did you ever wonder what you'd say to God if He sneezed?
 %
-"Did YOU find a DIGITAL WATCH in YOUR box of VELVEETA?"
-		-- Zippy the Pinhead
-%
 Did you hear about the model who sat
 on a broken bottle and cut a nice figure?
 %
@@ -15888,9 +15859,6 @@ Didja' ever have to make up your mind?
 %
 Didja hear about the dyslexic devil worshipper who sold his soul to Santa?
 %
-"Didn't I buy a 1951 Packard from you last March in Cairo?"
-		-- Zippy the Pinhead
-%
 Die?  I should say not, dear fellow.  No Barrymore
 would allow such a conventional thing to happen to him.
 		-- John Barrymore's dying words
@@ -23576,9 +23544,6 @@ I didn't know he was dead; I thought he was British.
 I didn't like the play, but I saw it under adverse conditions.
 The curtain was up.
 %
-"I didn't order any WOO-WOO...  Maybe a YUBBA...  But no WOO-WOO!"
-		-- Zippy the Pinhead
-%
 I disagree with what you say, but will defend
 to the death your right to tell such LIES!
 %
@@ -24150,9 +24115,6 @@ I have a very small mind and must live with it.
 I have a very strange feeling about this...
 		-- Luke Skywalker
 %
-"I have accepted Provolone into my life!"
-		-- Zippy the Pinhead
-%
 I have already given two cousins to the war and I stand ready to
 sacrifice my wife's brother.
 		-- Artemus Ward
@@ -24413,8 +24375,6 @@ I just ate a whole package of Sweet Tarts and a can of Coke.
 I think I saw God.
 		-- B. Hathrume Duk
 %
-I just forgot my whole philosophy of life!!!
-%
 I just got off the phone with Sonny Barger [President of the Hell's Angels].
 He wants me to appear as a character witness for him at his murder trial
 and said he'd be glad to appear as a character witness on my behalf if I
@@ -25488,9 +25448,6 @@ Elsewhere', won't scream, `FORGET IT, BLANCHE ... IT'S TIME FOR "HEE
 HAW"!!'"
 		-- Berke Breathed, "Bloom County"
 %
-I want to kill everyone here with a cute colorful Hydrogen Bomb!!
-		-- Zippy the Pinhead
-%
 I want to marry a girl just like the girl that married dear old dad.
 		-- Freud
 %
@@ -28081,9 +28038,6 @@ The world should make a place for shoe salesmen.
 I'm an evolutionist; I refuse to believe
 that I could have been created by man.
 %
-"I'm ANN LANDERS!!  I can SHOPLIFT!!"
-		-- Zippy the Pinhead
-%
 I'm changing my name to Chrysler
 I'm going down to Washington, D.C.
 I'll tell some power broker
@@ -28102,7 +28056,7 @@ I'm dying beyond my means.
 		-- Oscar Wilde, his last words, while sipping champagne
 %
 "I'm dying," he croaked.
-"My experiment was a success," the chemist retorted .
+"My experiment was a success," the chemist retorted.
 "You can't really train a beagle," he dogmatized.
 "That's no beagle, it's a mongrel," she muttered.
 "The fire is going out," he bellowed.
@@ -29362,10 +29316,6 @@ Is a computer language with goto's totally Wirth-less?
 %
 Is a person who blows up banks an econoclast?
 %
-"Is a tatoo real, like a curb or a battleship?
-Or are we suffering in Safeway?"
-		-- Zippy the Pinhead
-%
 Is a wedding successful if it comes off without a hitch?
 %
 Is death legally binding?
@@ -35153,9 +35103,6 @@ from which we can explore and understand and utilize it. To turn back now
 would be to deny our history, our capabilities.
 		-- James A. Michener
 %
-"My pants just went on a wild rampage through a Long Island Bowling Alley!!"
-		-- Zippy the Pinhead
-%
 My parents went to Niagra Falls and all I got was this crummy life.
 %
 My pen is at the bottom of a page,
@@ -37384,8 +37331,6 @@ girl knelt by her bed to say her prayers.  "God bless Mommy and Daddy and
 Keith and Kim," she said.  As she began to get up, she quickly added, "Oh,
 and God, this is goodbye.  We're moving to Hollywood."
 %
-On the road, ZIPPY is a pinhead without a purpose, but never without a POINT.
-%
 On the subject of C program indentation:
 
 	"In My Egotistical Opinion, most people's C programs should be
@@ -57657,10 +57602,6 @@ Who was that masked man?
 %
 Who will take care of the world after you're gone?
 %
-"WHOA!!  Ken and Barbie are having TOO MUCH FUN!!
-It must be the NEGATIVE IONS!!"
-		-- Zippy the Pinhead
-%
 Whoever dies with the most toys wins.
 %
 Whoever fights monsters should see to it that in the process he does not
@@ -60906,30 +60847,6 @@ You've got to pity New Mexico... so far from heaven and so close to Texas.
 
 "TOMORROW!  I haven't even prepared for *_________yesterday* yet!"
 %
-"Yow!  Am I having fun yet?"
-		-- Zippy the Pinhead
-%
-"Yow!  Am I in Milwaukee?"
-		-- Zippy the Pinhead
-%
-"Yow!  And then we could sit on the hoods of cars at stop lights!"
-		-- Zippy the Pinhead
-%
-"Yow!  Did something bad happen or am I in a drive-in movie?"
-		-- Zippy the Pinhead
-%
-YOW!!  Everybody out of the GENETIC POOL!
-%
-"Yow!  Is this sexual intercourse yet?  Is it, huh, is it?"
-		-- Zippy the Pinhead
-%
-"Yow!!  Those people look exactly like Donnie and Marie Osmond!!"
-		-- Zippy the Pinhead
-%
-"Yow! Now I get to think about all the BAD THINGS I did
-to a BOWLING BALL when I was in JUNIOR HIGH SCHOOL!"
-		-- Zippy the Pinhead
-%
 YO-YO:
 	Something that is occasionally up but normally down.
 	(see also Computer).
diff --git a/games/fortune/datfiles/fortunes.sp.ok b/games/fortune/datfiles/fortunes.sp.ok
index e5eed4075fa7..86af917660a6 100644
--- a/games/fortune/datfiles/fortunes.sp.ok
+++ b/games/fortune/datfiles/fortunes.sp.ok
@@ -1249,7 +1249,6 @@ Yoric
 Youngman
 Yuletide
 Yutang
-ZIPPY
 ZORAC
 Zanuck
 Zappa
@@ -1259,7 +1258,6 @@ Zelkowitz
 Zeno's
 Zern
 Zilla
-Zippy
 Zonker
 Zorkmids
 Zorro
diff --git a/games/fortune/datfiles/fortunes2-o b/games/fortune/datfiles/fortunes2-o
index 06e3ce2158db..ac190e7512da 100644
--- a/games/fortune/datfiles/fortunes2-o
+++ b/games/fortune/datfiles/fortunes2-o
@@ -7076,9 +7076,6 @@ Heisenberg may have done it.
 	At a mouthful of spunk,
 But the smell of his ass makes me sick!"
 %
-"Hello?  Enema Bondage?  I'm calling because I want to be happy, I guess..."
-		-- Zippy the Pinhead
-%
 Hello, children!!
 	This is Uncle Dennis welcoming you to your very own fortune.
 	Today we are going to hear a story, so sit right here on my lap
diff --git a/games/fortune/datfiles/zippy b/games/fortune/datfiles/zippy
index c2dd028b7676..e7f54889cd9a 100644
--- a/games/fortune/datfiles/zippy
+++ b/games/fortune/datfiles/zippy
@@ -217,8 +217,6 @@ Half a mind is a terrible thing to waste!
 Hand me a pair of leather pants and a CASIO keyboard -- I'm living for
 today!
 %
-Has everybody got HALVAH spread all over their ANKLES??
-%
 Has everybody got HALVAH spread all over their ANKLES?? ...  Now, it's
 time to "HAVE A NAGEELA"!!
 %