diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/Badges.java b/src/com/shatteredpixel/shatteredpixeldungeon/Badges.java
index 65f63252b..7907a78b3 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/Badges.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/Badges.java
@@ -716,7 +716,7 @@ public class Badges {
 		}
 	}
 
-    //TODO: Replace this badge, Delayed to 0.2.3, for real this time
+    //TODO: Replace this badge, delayed until an eventual badge rework
 	public static void validateRingOfHaggler() {
 		if (!local.contains( Badge.RING_OF_HAGGLER )/* && new RingOfThorns().isKnown()*/) {
 			Badge badge = Badge.RING_OF_HAGGLER;
@@ -725,7 +725,7 @@ public class Badges {
 		}
 	}
 
-    //TODO: Replace this badge, Delayed to 0.2.3, for real this time
+    //TODO: Replace this badge, delayed until an eventual badge rework
 	public static void validateRingOfThorns() {
 		if (!local.contains( Badge.RING_OF_THORNS )/* && new RingOfThorns().isKnown()*/) {
 			Badge badge = Badge.RING_OF_THORNS;
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/SnipersMark.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/SnipersMark.java
index d9ab4a418..f4c9412e5 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/SnipersMark.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/SnipersMark.java
@@ -20,7 +20,6 @@ package com.shatteredpixel.shatteredpixeldungeon.actors.buffs;
 import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator;
 import com.watabou.utils.Bundle;
 
-//TODO: consider refactoring this
 public class SnipersMark extends FlavourBuff {
 
 	public int object = 0;
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Goo.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Goo.java
index e8993a914..03509b815 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Goo.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Goo.java
@@ -47,7 +47,6 @@ import com.watabou.utils.Bundle;
 import com.watabou.utils.Random;
 
 public class Goo extends Mob {
-//todo: will need to manually recreate stuff from 1.7.5 here
 	{
 		name = "Goo";
 		HP = HT = 80;
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Viscosity.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Viscosity.java
index 379da5d0d..a00448f87 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Viscosity.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Viscosity.java
@@ -125,7 +125,7 @@ public class Viscosity extends Glyph {
 				
 				target.damage( 1, this );
 				if (target == Dungeon.hero && !target.isAlive()) {
-					// FIXME
+
 					Glyph glyph = new Viscosity();
 					Dungeon.fail( Utils.format( ResultDescriptions.GLYPH, glyph.name() ) );
 					GLog.n( "%s killed you...", glyph.name() );
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/scenes/RankingsScene.java b/src/com/shatteredpixel/shatteredpixeldungeon/scenes/RankingsScene.java
index 8f4ba3b69..f1156c513 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/scenes/RankingsScene.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/scenes/RankingsScene.java
@@ -37,7 +37,6 @@ import com.shatteredpixel.shatteredpixeldungeon.windows.WndError;
 import com.shatteredpixel.shatteredpixeldungeon.windows.WndRanking;
 import com.watabou.utils.GameMath;
 
-//FIXME: need to modify this to properly account for new landscape logic, more than just a merge.
 public class RankingsScene extends PixelScene {
 	
 	private static final String TXT_TITLE		= "Top Rankings";