diff --git a/src/dehacked.c b/src/dehacked.c
index b2d3bff3ab04b83405df33b14ca7c5ce99bcd489..c172549e1bcf2a7d12965d9cdace291136ab01d8 100644
--- a/src/dehacked.c
+++ b/src/dehacked.c
@@ -4700,23 +4700,6 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit
// THZ Plant
"S_THZFLOWERA",
"S_THZFLOWERB",
- "S_YELLOWSPINFLOWER",
-
- // THZ Tree
- "S_THZTREE",
- "S_THZTREEBRANCH1",
- "S_THZTREEBRANCH2",
- "S_THZTREEBRANCH3",
- "S_THZTREEBRANCH4",
- "S_THZTREEBRANCH5",
- "S_THZTREEBRANCH6",
- "S_THZTREEBRANCH7",
- "S_THZTREEBRANCH8",
- "S_THZTREEBRANCH9",
- "S_THZTREEBRANCH10",
- "S_THZTREEBRANCH11",
- "S_THZTREEBRANCH12",
- "S_THZTREEBRANCH13",
// THZ Alarm
"S_ALARM1",
@@ -6146,10 +6129,7 @@ static const char *const MOBJTYPE_LIST[] = { // array length left dynamic for s
// Techno Hill Scenery
"MT_THZFLOWER1",
- "MT_THZTREE",
- "MT_THZTREEBRANCH",
"MT_THZFLOWER2",
- "MT_YELLOWSPINFLOWER",
"MT_ALARM",
// Deep Sea Scenery
diff --git a/src/info.c b/src/info.c
index 256d430ae7846466cbcd781f725cadaf807efa8e..acb12379a9e021c93fa07155ab668b1592dc075b 100644
--- a/src/info.c
+++ b/src/info.c
@@ -191,9 +191,7 @@ char sprnames[NUMSPRITES + 1][5] =
// Techno Hill Scenery
"THZP", // Techno Hill Zone Plant
- "THZT", // THZ Tree
"FWR5", // Another one
- "FWR6",
"ALRM", // THZ2 Alarm
// Deep Sea Scenery
@@ -1913,25 +1911,6 @@ state_t states[NUMSTATES] =
{SPR_THZP, FF_ANIMATE, -1, {NULL}, 7, 4, S_NULL}, // S_THZFLOWERA
{SPR_FWR5, FF_ANIMATE, -1, {NULL}, 19, 2, S_NULL}, // S_THZFLOWERB
- {SPR_FWR6, FF_ANIMATE, 0, {NULL}, 19, 2, S_NULL}, // S_YELLOWSPINFLOWER
-
- // THZ Tree
- {SPR_THZT, 0, -1, {NULL}, 0, 0, S_THZTREE}, // S_THZTREE
-
- // THZ Tree Branches
- {SPR_THZT, 1|FF_PAPERSPRITE, 40, {NULL}, 0, 0, S_THZTREEBRANCH2}, // S_THZTREEBRANCH1
- {SPR_THZT, 2|FF_PAPERSPRITE, 4, {NULL}, 0, 0, S_THZTREEBRANCH3}, // S_THZTREEBRANCH2
- {SPR_THZT, 3|FF_PAPERSPRITE, 4, {NULL}, 0, 0, S_THZTREEBRANCH4}, // S_THZTREEBRANCH3
- {SPR_THZT, 4|FF_PAPERSPRITE, 4, {NULL}, 0, 0, S_THZTREEBRANCH5}, // S_THZTREEBRANCH4
- {SPR_THZT, 5|FF_PAPERSPRITE, 4, {NULL}, 0, 0, S_THZTREEBRANCH6}, // S_THZTREEBRANCH5
- {SPR_THZT, 6|FF_PAPERSPRITE, 4, {NULL}, 0, 0, S_THZTREEBRANCH7}, // S_THZTREEBRANCH6
- {SPR_THZT, 7|FF_PAPERSPRITE, 4, {NULL}, 0, 0, S_THZTREEBRANCH8}, // S_THZTREEBRANCH7
- {SPR_THZT, 8|FF_PAPERSPRITE, 4, {NULL}, 0, 0, S_THZTREEBRANCH9}, // S_THZTREEBRANCH8
- {SPR_THZT, 9|FF_PAPERSPRITE, 4, {NULL}, 0, 0, S_THZTREEBRANCH10}, // S_THZTREEBRANCH9
- {SPR_THZT, 10|FF_PAPERSPRITE, 4, {NULL}, 0, 0, S_THZTREEBRANCH11},// S_THZTREEBRANCH10
- {SPR_THZT, 11|FF_PAPERSPRITE, 4, {NULL}, 0, 0, S_THZTREEBRANCH12},// S_THZTREEBRANCH11
- {SPR_THZT, 12|FF_PAPERSPRITE, 4, {NULL}, 0, 0, S_THZTREEBRANCH13},// S_THZTREEBRANCH12
- {SPR_THZT, 13|FF_PAPERSPRITE, 4, {NULL}, 0, 0, S_THZTREEBRANCH1}, // S_THZTREEBRANCH13
// THZ Alarm
{SPR_ALRM, FF_FULLBRIGHT, 35, {A_Scream}, 0, 0, S_ALARM1}, // S_ALARM1
@@ -8604,60 +8583,6 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_NULL // raisestate
},
- { // MT_THZTREE
- 904, // doomednum
- S_THZTREE, // spawnstate
- 1000, // spawnhealth
- S_NULL, // seestate
- sfx_None, // seesound
- 8, // reactiontime
- sfx_None, // attacksound
- S_NULL, // painstate
- 0, // painchance
- sfx_None, // painsound
- S_NULL, // meleestate
- S_NULL, // missilestate
- S_NULL, // deathstate
- S_NULL, // xdeathstate
- sfx_None, // deathsound
- 8, // speed
- 16*FRACUNIT, // radius
- 64*FRACUNIT, // height
- 0, // display offset
- 16, // mass
- 0, // damage
- sfx_None, // activesound
- MF_NOBLOCKMAP|MF_SCENERY, // flags
- S_NULL // raisestate
- },
-
- { // MT_THZTREEBRANCH
- -1, // doomednum
- S_THZTREEBRANCH1,// spawnstate
- 1000, // spawnhealth
- S_NULL, // seestate
- sfx_None, // seesound
- 8, // reactiontime
- sfx_None, // attacksound
- S_NULL, // painstate
- 0, // painchance
- sfx_None, // painsound
- S_NULL, // meleestate
- S_NULL, // missilestate
- S_NULL, // deathstate
- S_NULL, // xdeathstate
- sfx_None, // deathsound
- 8, // speed
- 1*FRACUNIT, // radius
- 1*FRACUNIT, // height
- 0, // display offset
- 16, // mass
- 0, // damage
- sfx_None, // activesound
- MF_NOBLOCKMAP|MF_SCENERY, // flags
- S_NULL // raisestate
- },
-
{ // MT_THZFLOWER2
902, // doomednum
S_THZFLOWERB, // spawnstate
@@ -8684,33 +8609,6 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
MF_NOBLOCKMAP|MF_NOCLIP|MF_SCENERY, // flags
S_NULL // raisestate
},
-
- { // MT_YELLOWSPINFLOWER
- 903, // doomednum
- S_YELLOWSPINFLOWER, // spawnstate
- 1000, // spawnhealth
- S_NULL, // seestate
- sfx_None, // seesound
- 8, // reactiontime
- sfx_None, // attacksound
- S_NULL, // painstate
- 0, // painchance
- sfx_None, // painsound
- S_NULL, // meleestate
- S_NULL, // missilestate
- S_NULL, // deathstate
- S_NULL, // xdeathstate
- sfx_None, // deathsound
- 8, // speed
- 16*FRACUNIT, // radius
- 64*FRACUNIT, // height
- 0, // display offset
- 16, // mass
- 0, // damage
- sfx_None, // activesound
- MF_NOBLOCKMAP|MF_NOCLIP|MF_SCENERY, // flags
- S_NULL // raisestate
- },
{ // MT_ALARM
901, // doomednum
diff --git a/src/info.h b/src/info.h
index 2d368094d66eabfc7d77a5b22c9812386aa27e59..35a3f5f151ea7cc744d89efb66b8788c552c7953 100644
--- a/src/info.h
+++ b/src/info.h
@@ -390,9 +390,7 @@ typedef enum sprite
// Techno Hill Scenery
SPR_THZP, // THZ1 Flower
- SPR_THZT, // THZ Tree
SPR_FWR5, // Another flower
- SPR_FWR6,
SPR_ALRM, // THZ2 Alarm
// Deep Sea Scenery
@@ -2021,23 +2019,6 @@ typedef enum state
// THZ Plant
S_THZFLOWERA,
S_THZFLOWERB,
- S_YELLOWSPINFLOWER,
-
- // THZ Tree
- S_THZTREE,
- S_THZTREEBRANCH1,
- S_THZTREEBRANCH2,
- S_THZTREEBRANCH3,
- S_THZTREEBRANCH4,
- S_THZTREEBRANCH5,
- S_THZTREEBRANCH6,
- S_THZTREEBRANCH7,
- S_THZTREEBRANCH8,
- S_THZTREEBRANCH9,
- S_THZTREEBRANCH10,
- S_THZTREEBRANCH11,
- S_THZTREEBRANCH12,
- S_THZTREEBRANCH13,
// THZ Alarm
S_ALARM1,
@@ -3487,10 +3468,7 @@ typedef enum mobj_type
// Techno Hill Scenery
MT_THZFLOWER1,
- MT_THZTREE,
- MT_THZTREEBRANCH,
MT_THZFLOWER2,
- MT_YELLOWSPINFLOWER,
MT_ALARM,
// Deep Sea Scenery
diff --git a/src/p_mobj.c b/src/p_mobj.c
index cfc43cda266bd28bda286db83659242bad962f34..8695d57e4098898e48a24530f718818e861b2bb8 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -8433,17 +8433,6 @@ mobj_t *P_SpawnMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type)
case MT_BLUETEAMRING:
mobj->color = skincolor_blueteam;
break;
- case MT_THZTREE:
- {
- mobj_t *branch1 = P_SpawnMobj(mobj->x+FRACUNIT, mobj->y, mobj->z, MT_THZTREEBRANCH);
- mobj_t *branch2 = P_SpawnMobj(mobj->x, mobj->y+FRACUNIT, mobj->z, MT_THZTREEBRANCH);
- mobj_t *branch3 = P_SpawnMobj(mobj->x-FRACUNIT, mobj->y, mobj->z, MT_THZTREEBRANCH);
-
- branch1->angle = mobj->angle + ANGLE_22h;
- branch2->angle = mobj->angle + ANGLE_157h;
- branch3->angle = mobj->angle + ANGLE_270;
- }
- break;
case MT_RING:
case MT_COIN:
case MT_BLUEBALL: