diff --git a/src/p_mobj.c b/src/p_mobj.c
index df08cb9be38e5c1333cf03b42da3a57d0f66883d..15da6e6165880660d9012b5a832463731cf6431f 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -10493,6 +10493,7 @@ void P_MobjThinker(mobj_t *mobj)
 		case MT_GRENADEPICKUP:
 			if (mobj->health == 0) // Fading tile
 			{
+				// TODO: Maybe use mobj->alpha instead of messing with frame flags
 				INT32 value = mobj->info->damage/10;
 				value = mobj->fuse/value;
 				value = 10-value;
@@ -10503,9 +10504,6 @@ void P_MobjThinker(mobj_t *mobj)
 
 				mobj->frame &= ~FF_TRANSMASK;
 				mobj->frame |= value << FF_TRANSSHIFT;
-				
-				// TODO: Consider replacing the above with the commented-out line of code below
-				//mobj->alpha = FixedDiv(mobj->fuse, mobj->info->damage);
 			}
 			break;
 		default:
diff --git a/src/r_things.c b/src/r_things.c
index a27a03e77fda6e89bd3665ce03da4c94d1703484..defdc7aaaf07db4aaa32a4aaf59c78b7283607df 100644
--- a/src/r_things.c
+++ b/src/r_things.c
@@ -3428,10 +3428,8 @@ boolean R_ThingVisible (mobj_t *thing)
 		(thing->sprite == SPR_NULL) || // Don't draw null-sprites
 		(thing->flags2 & MF2_DONTDRAW) || // Don't draw MF2_LINKDRAW objects
 		(thing->drawonlyforplayer && thing->drawonlyforplayer != viewplayer) || // Don't draw other players' personal objects
-		//(thing->alpha == 0) || // Don't draw objects with an alpha of 0
 		((rendermode == render_soft && R_GetTransmapFromAlpha(thing->alpha, (thing->frame & FF_TRANSMASK)>>FF_TRANSSHIFT) >= 10) ||
-		(rendermode == render_opengl && thing->alpha == 0)) || // TODO: Maybe rethink this
-		//(rendermode == render_soft && R_GetTransmapFromAlpha(thing->alpha, (thing->frame & FF_TRANSMASK)>>FF_TRANSSHIFT) >= 10) ||
+		(rendermode == render_opengl && thing->alpha == 0)) ||
 		(!P_MobjWasRemoved(r_viewmobj) && (
 		  (r_viewmobj == thing) || // Don't draw first-person players or awayviewmobj objects
 		  (r_viewmobj->player && r_viewmobj->player->followmobj == thing) || // Don't draw first-person players' followmobj