diff --git a/data/Makefile.am b/data/Makefile.am
index cad0b9ff4..abbb8941f 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -35,7 +35,6 @@ lisp += \
     \
     addon/bong/bong.lsp \
     \
-    addon/claudio/claudio.lsp addon/claudio/oldclaud.lsp \
     addon/deathmat/cur_lev.lsp addon/deathmat/deathmat.lsp \
     addon/deathmat/dstartup.lsp addon/deathmat/gamename.lsp \
     addon/deathmat/large.lsp addon/deathmat/levelset.lsp \
@@ -113,21 +112,6 @@ art += \
     \
     addon/bong/bong.spe \
     \
-    addon/claudio/antship.spe addon/claudio/bigexp.spe \
-    addon/claudio/deepw1.spe addon/claudio/deepw2.spe addon/claudio/droid.spe \
-    addon/claudio/extiles.spe addon/claudio/fire.spe addon/claudio/lamp.spe \
-    addon/claudio/lava2.spe addon/claudio/mypanels.spe \
-    addon/claudio/nplatfor.spe addon/claudio/pal21.spe addon/claudio/pal2.spe \
-    addon/claudio/pal5.spe addon/claudio/pal81f.spe addon/claudio/pal81.spe \
-    addon/claudio/pal82f.spe addon/claudio/pal82.spe addon/claudio/pal90.spe \
-    addon/claudio/rob2.spe addon/claudio/skull.spe addon/claudio/spaced.spe \
-    addon/claudio/spaceh.spe addon/claudio/spacymed.spe \
-    addon/claudio/spacytdm.spe addon/claudio/sswitch.spe \
-    addon/claudio/t_lamp.spe addon/claudio/trex1.spe \
-    addon/claudio/t_skull.spe addon/claudio/t_space.spe \
-    addon/claudio/t_trex.spe addon/claudio/t_water.spe \
-    addon/claudio/umbrel3.spe addon/claudio/watem.spe \
-    \
     addon/example/example.spe \
     \
     addon/leon/gray.spe addon/leon/level00.spe addon/leon/level01.spe \
@@ -214,7 +198,6 @@ demos = \
 doc = \
     addon/aliens/aliens.txt \
     addon/aliens/readme.txt \
-    addon/claudio/palettes.txt \
     addon/leon/leon.txt \
     addon/newart/tiledoc.txt \
     addon/pong/pong.txt \
@@ -267,11 +250,6 @@ sound += \
     addon/aliens/altaunt.wav addon/aliens/aslash01.wav \
     addon/aliens/egghatch.wav addon/aliens/jarbreak.wav \
     \
-    addon/claudio/aship.wav addon/claudio/drill.wav addon/claudio/fire.wav \
-    addon/claudio/glass1.wav addon/claudio/sewers.wav addon/claudio/skull.wav \
-    addon/claudio/spaceo.wav addon/claudio/trex1.wav addon/claudio/trex2.wav \
-    addon/claudio/unhealth.wav addon/claudio/wfall.wav \
-    \
     addon/leon/sfx/ambship1.wav addon/leon/sfx/ambship2.wav \
     addon/leon/sfx/gren5.wav addon/leon/sfx/gren6.wav \
     addon/leon/sfx/rain2.wav addon/leon/sfx/rain3.wav \
diff --git a/data/Makefile.in b/data/Makefile.in
index b27371448..77b140231 100644
--- a/data/Makefile.in
+++ b/data/Makefile.in
@@ -184,7 +184,6 @@ lisp = abuse.lsp edit.lsp hardness.lsp music/playhmp.lsp lisp/ant.lsp \
 	addon/aliens/objects.lsp addon/aliens/powerold.lsp \
 	addon/aliens/powerups.lsp addon/aliens/sfx.lsp \
 	addon/aliens/tiles.lsp addon/bong/bong.lsp \
-	addon/claudio/claudio.lsp addon/claudio/oldclaud.lsp \
 	addon/deathmat/cur_lev.lsp addon/deathmat/deathmat.lsp \
 	addon/deathmat/dstartup.lsp addon/deathmat/gamename.lsp \
 	addon/deathmat/large.lsp addon/deathmat/levelset.lsp \
@@ -245,23 +244,6 @@ art = art/ant.spe art/ball.spe art/blowups.spe art/bold.spe \
 	art/tints/guns/orange.spe art/tints/guns/redish.spe \
 	addon/aliens/aliens.spe addon/aliens/bactiles.spe \
 	addon/aliens/fortiles.spe addon/bong/bong.spe \
-	addon/claudio/antship.spe addon/claudio/bigexp.spe \
-	addon/claudio/deepw1.spe addon/claudio/deepw2.spe \
-	addon/claudio/droid.spe addon/claudio/extiles.spe \
-	addon/claudio/fire.spe addon/claudio/lamp.spe \
-	addon/claudio/lava2.spe addon/claudio/mypanels.spe \
-	addon/claudio/nplatfor.spe addon/claudio/pal21.spe \
-	addon/claudio/pal2.spe addon/claudio/pal5.spe \
-	addon/claudio/pal81f.spe addon/claudio/pal81.spe \
-	addon/claudio/pal82f.spe addon/claudio/pal82.spe \
-	addon/claudio/pal90.spe addon/claudio/rob2.spe \
-	addon/claudio/skull.spe addon/claudio/spaced.spe \
-	addon/claudio/spaceh.spe addon/claudio/spacymed.spe \
-	addon/claudio/spacytdm.spe addon/claudio/sswitch.spe \
-	addon/claudio/t_lamp.spe addon/claudio/trex1.spe \
-	addon/claudio/t_skull.spe addon/claudio/t_space.spe \
-	addon/claudio/t_trex.spe addon/claudio/t_water.spe \
-	addon/claudio/umbrel3.spe addon/claudio/watem.spe \
 	addon/example/example.spe addon/leon/gray.spe \
 	addon/leon/level00.spe addon/leon/level01.spe \
 	addon/leon/level02.spe addon/leon/lmisc.spe \
@@ -333,7 +315,6 @@ demos = \
 doc = \
     addon/aliens/aliens.txt \
     addon/aliens/readme.txt \
-    addon/claudio/palettes.txt \
     addon/leon/leon.txt \
     addon/newart/tiledoc.txt \
     addon/pong/pong.txt \
@@ -414,17 +395,6 @@ extra = \
 @HAVE_NONFREE_TRUE@	addon/aliens/aslash01.wav \
 @HAVE_NONFREE_TRUE@	addon/aliens/egghatch.wav \
 @HAVE_NONFREE_TRUE@	addon/aliens/jarbreak.wav \
-@HAVE_NONFREE_TRUE@	addon/claudio/aship.wav \
-@HAVE_NONFREE_TRUE@	addon/claudio/drill.wav \
-@HAVE_NONFREE_TRUE@	addon/claudio/fire.wav \
-@HAVE_NONFREE_TRUE@	addon/claudio/glass1.wav \
-@HAVE_NONFREE_TRUE@	addon/claudio/sewers.wav \
-@HAVE_NONFREE_TRUE@	addon/claudio/skull.wav \
-@HAVE_NONFREE_TRUE@	addon/claudio/spaceo.wav \
-@HAVE_NONFREE_TRUE@	addon/claudio/trex1.wav \
-@HAVE_NONFREE_TRUE@	addon/claudio/trex2.wav \
-@HAVE_NONFREE_TRUE@	addon/claudio/unhealth.wav \
-@HAVE_NONFREE_TRUE@	addon/claudio/wfall.wav \
 @HAVE_NONFREE_TRUE@	addon/leon/sfx/ambship1.wav \
 @HAVE_NONFREE_TRUE@	addon/leon/sfx/ambship2.wav \
 @HAVE_NONFREE_TRUE@	addon/leon/sfx/gren5.wav \
diff --git a/data/abuse.lsp b/data/abuse.lsp
index cc09aa930..6b15f8dd2 100644
--- a/data/abuse.lsp
+++ b/data/abuse.lsp
@@ -42,7 +42,6 @@
 (load "addon/twist/f2chars.lsp")
 (load "addon/twist/f2ai.lsp")
 (load "addon/aliens/astartup.lsp")
-(load "addon/claudio/claudio.lsp")
 (load "addon/twist/lisp/dray.lsp")
 (load "addon/twist/lisp/mario.lsp")
 (load "addon/leon/4frabs.lsp")
@@ -50,13 +49,11 @@
 
 (setq bad_guy_list
   (list DARNEL ANT_ROOF TRACK_GUN SPRAY_GUN JUGGER ROB1 WHO ROCKET FLYER
-        GREEN_FLYER BOSS_ANT DROID_JUGGER DROID DEATH_SKULL DEATH_UMBRELLA
-        ANT_SHIP WALK_ROB T_REX FACE_HUGGER ALIEN_DRONE ALIEN_WARRIOR ANT
+        GREEN_FLYER BOSS_ANT WALK_ROB FACE_HUGGER ALIEN_DRONE ALIEN_WARRIOR ANT
         ANT_JUMPER ANT_PRED ANT_GREATER2 WALK_ROB2 WALK_ROBHEAD))
 (setq object_destroyable_list
   (list DARNEL ANT_ROOF TRACK_GUN SPRAY_GUN JUGGER ROB1 WHO ROCKET FLYER
-        GREEN_FLYER BOSS_ANT DROID_JUGGER DROID DEATH_SKULL DEATH_UMBRELLA
-        ANT_SHIP WALK_ROB T_REX FACE_HUGGER ALIEN_DRONE ALIEN_WARRIOR ANT
+        GREEN_FLYER BOSS_ANT WALK_ROB FACE_HUGGER ALIEN_DRONE ALIEN_WARRIOR ANT
         ANT_JUMPER ANT_PRED ANT_GREATER2 WALK_ROB2 WALK_ROBHEAD))
 
 (gc)              ;; garbage collection perm space
diff --git a/data/addon/deathmat/deathmat.lsp b/data/addon/deathmat/deathmat.lsp
index 3d5a78e77..5452ddad7 100644
--- a/data/addon/deathmat/deathmat.lsp
+++ b/data/addon/deathmat/deathmat.lsp
@@ -28,7 +28,6 @@
 (load "lisp/switch.lsp")
 
 ;; Artwork from fRaBs
-(load "addon/claudio/claudio.lsp")
 (load "addon/aliens/astartup.lsp")
 (load "addon/newart/newart.lsp")
 (load "addon/leon/4frabsdm.lsp")
diff --git a/data/addon/newart/tiledoc.txt b/data/addon/newart/tiledoc.txt
index 5dbebea33..3f864353c 100644
--- a/data/addon/newart/tiledoc.txt
+++ b/data/addon/newart/tiledoc.txt
@@ -21,8 +21,6 @@ NEW FOREGROUND TILES
 /addon/newart/frabs_2.spe   1250-1285
 /addon/newart/final.spe     1300-1336
 /addon/aliens/fortiles.spe  2000-2077
-/addon/claudio/pal81f.spe   2200-2217
-/addon/claudio/pal82f.spe   2250-2283
 
 REGULAR ABUSE BACKGROUND TILES
 
@@ -38,11 +36,7 @@ REGULAR ABUSE BACKGROUND TILES
 NEW BACKGROUND TILES
 
 /addon/aliens/bactiles.spe  340-374
-/addon/claudio/pal2.spe     380-387
-/addon/claudio/pal5.spe     430-444
 /addon/newart/space.spe     450-468
-/addon/claudio/pal90.spe    475-494
-/addon/claudio/pal21.spe    500-529
 /addon/newart/blcave.spe    560-574
 /addon/newart/frbsblue.spe  580-611
 
@@ -72,39 +66,16 @@ FOREGROUND DESCRIPTIONS
 ;; Green cave foreground tiles used in
 ;; the Aliens Abuse addon, by Michael Moss
 
-/addon/claudio/pal81f.spe    2200
-/addon/claudio/pal82f.spe    2250
-;; Out of all the addon tiles for Abuse,
-;; Claudio Bolzoni's grey space ones just 
-;; stand out as the best. These were 
-;; numbered from 8100 in older versions of
-;; fRaBs.
-
 BACKGROUND DESCRIPTIONS
 
 /addon/aliens/bactiles.spe  340-374
 ;; Aliens Abuse background tiles. Have
 ;; you ever played Doom? :)
 
-/addon/claudio/pal2.spe     380-387
-;; Metal sewer tiles also from Doom.
-
-/addon/claudio/pal5.spe     430-444
-;; Limestone cave tiles! Very cool.
-;; Also by Claudio.
-
 /addon/newart/space.spe     450-468
 ;; Space tiles with planets. Thanks
 ;; Cypress!
 
-/addon/claudio/pal90.spe    475-494
-;; Starry tiles. These were
-;; numbered from 9000 in previous
-;; versions of fRaBs. By Claudio.
-
-/addon/claudio/pal21.spe    500-529
-;; Starry tiles by Claudio Bolzoni.
-
 /addon/newart/blcave.spe    560-574
 ;; Blue caves. By Cypress.
 
diff --git a/data/addon/twist/lisp/dray.lsp b/data/addon/twist/lisp/dray.lsp
index eba873f45..84c4e27e7 100644
--- a/data/addon/twist/lisp/dray.lsp
+++ b/data/addon/twist/lisp/dray.lsp
@@ -9,7 +9,7 @@
 ;; make sure you add all the objects that the deathray's light beam will have effect on.
 ;; the objects are simply the bad_guy_list... BUT, remove DARNEL from the list.
 
-(setq object_destroyable_list (list DARNEL ANT_ROOF TRACK_GUN SPRAY_GUN JUGGER ROB1 WHO ROCKET FLYER GREEN_FLYER BOSS_ANT DROID_JUGGER DROID DEATH_SKULL DEATH_UMBRELLA ANT_SHIP WALK_ROB T_REX FACE_HUGGER ALIEN_DRONE ALIEN_WARRIOR))
+(setq object_destroyable_list (list DARNEL ANT_ROOF TRACK_GUN SPRAY_GUN JUGGER ROB1 WHO ROCKET FLYER GREEN_FLYER BOSS_ANT WALK_ROB FACE_HUGGER ALIEN_DRONE ALIEN_WARRIOR))
 
 
 ;; this will allow the player to pick up both ammo and weapons.