diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfMagicMissile.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfMagicMissile.java
index 491dbbe6a..5e0ef4eb6 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfMagicMissile.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfMagicMissile.java
@@ -17,33 +17,16 @@
  */
 package com.shatteredpixel.shatteredpixeldungeon.items.wands;
 
-import com.shatteredpixel.shatteredpixeldungeon.Assets;
-import com.shatteredpixel.shatteredpixeldungeon.Badges;
-import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
-import com.shatteredpixel.shatteredpixeldungeon.ResultDescriptions;
 import com.shatteredpixel.shatteredpixeldungeon.actors.Actor;
 import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
-import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
 import com.shatteredpixel.shatteredpixeldungeon.effects.SpellSprite;
-import com.shatteredpixel.shatteredpixeldungeon.items.Item;
-import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfUpgrade;
 import com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee.MagesStaff;
 import com.shatteredpixel.shatteredpixeldungeon.mechanics.Ballistica;
-import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene;
 import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
-import com.shatteredpixel.shatteredpixeldungeon.utils.GLog;
-import com.shatteredpixel.shatteredpixeldungeon.utils.Utils;
-import com.shatteredpixel.shatteredpixeldungeon.windows.WndBag;
-import com.watabou.noosa.audio.Sample;
 import com.watabou.utils.Random;
 
-import java.util.ArrayList;
-
-//TODO: final balancing choices
 public class WandOfMagicMissile extends Wand {
 
-	public static final String AC_DISENCHANT	= "DISENCHANT";
-
 	{
 		name = "Wand of Magic Missile";
 		image = ItemSpriteSheet.WAND_MAGIC_MISSILE;
@@ -53,7 +36,7 @@ public class WandOfMagicMissile extends Wand {
 	protected void onZap( Ballistica bolt ) {
 				
 		Char ch = Actor.findChar( bolt.collisionPos );
-		if (ch != null) {	
+		if (ch != null) {
 			
 			int level = level();
 
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfVenom.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfVenom.java
index 8f834e35b..eb0fb8dc6 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfVenom.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfVenom.java
@@ -33,7 +33,6 @@ public class WandOfVenom extends Wand {
 
     @Override
     protected void fx(Ballistica bolt, Callback callback) {
-        //TODO: final visuals
         MagicMissile.poison(curUser.sprite.parent, bolt.sourcePos, bolt.collisionPos, callback);
         Sample.INSTANCE.play(Assets.SND_ZAP);
     }
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/levels/CavesBossLevel.java b/src/com/shatteredpixel/shatteredpixeldungeon/levels/CavesBossLevel.java
index 9cc47ee91..ff430bd20 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/levels/CavesBossLevel.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/levels/CavesBossLevel.java
@@ -128,7 +128,6 @@ public class CavesBossLevel extends Level {
 		Painter.fill( this, ROOM_LEFT, ROOM_TOP + 1, 
 			ROOM_RIGHT - ROOM_LEFT + 1, ROOM_BOTTOM - ROOM_TOP, Terrain.EMPTY );
 
-		//TODO Trap refactor
 		Painter.fill( this, ROOM_LEFT, ROOM_TOP, 
 			ROOM_RIGHT - ROOM_LEFT + 1, 1, Terrain.INACTIVE_TRAP );
 		
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/levels/Terrain.java b/src/com/shatteredpixel/shatteredpixeldungeon/levels/Terrain.java
index 94fdfd00b..a1be1f145 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/levels/Terrain.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/levels/Terrain.java
@@ -118,7 +118,6 @@ public class Terrain {
 		}
 	};
 
-	//TODO: everything that touches this needs new trap logic
 	public static int discover( int terr ) {
 		switch (terr) {
 		case SECRET_DOOR:
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/levels/traps/Trap.java b/src/com/shatteredpixel/shatteredpixeldungeon/levels/traps/Trap.java
index a32b0273d..13bcc35ea 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/levels/traps/Trap.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/levels/traps/Trap.java
@@ -26,7 +26,6 @@ public abstract class Trap implements Bundlable {
 		return this;
 	}
 
-	//TODO: fade-in effect here?
 	public Trap reveal() {
 		visible = true;
 		if (sprite != null) {
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/sprites/CharSprite.java b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/CharSprite.java
index 5a721e36d..969947bbf 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/sprites/CharSprite.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/CharSprite.java
@@ -327,7 +327,6 @@ public class CharSprite extends MovieClip implements Tweener.Listener, MovieClip
 				chilled.on = false;
 				chilled = null;
 			}
-		//TODO: maybe add some particles here?
 		case DARKENED:
 			if (darkBlock != null) {
 				darkBlock.lighten();