diff --git a/SPD-classes/src/main/java/com/watabou/glwrap/Texture.java b/SPD-classes/src/main/java/com/watabou/glwrap/Texture.java
index 0494e1910..20fd0a6c4 100644
--- a/SPD-classes/src/main/java/com/watabou/glwrap/Texture.java
+++ b/SPD-classes/src/main/java/com/watabou/glwrap/Texture.java
@@ -142,33 +142,6 @@ public class Texture {
 			imageBuffer );
 	}
 	
-	// If getConfig returns null (unsupported format?), GLUtils.texImage2D works
-	// incorrectly. In this case we need to load pixels manually
-	//TODO this seems to be unused, and is dependant on android code, remove?
-	/*public void handMade( Bitmap bitmap, boolean recode ) {
-
-		int w = bitmap.getWidth();
-		int h = bitmap.getHeight();
-		
-		int[] pixels = new int[w * h];
-		bitmap.getPixels( pixels, 0, w, 0, 0, w, h );
-
-		// recode - components reordering is needed
-		if (recode) {
-			for (int i=0; i < pixels.length; i++) {
-				int color = pixels[i];
-				int ag = color & 0xFF00FF00;
-				int r = (color >> 16) & 0xFF;
-				int b = color & 0xFF;
-				pixels[i] = ag | (b << 16) | r;
-			}
-		}
-		
-		pixels( w, h, pixels );
-		
-		premultiplied = false;
-	}*/
-	
 	public static Texture create( Pixmap pix ) {
 		Texture tex = new Texture();
 		tex.bitmap( pix );
diff --git a/SPD-classes/src/main/java/com/watabou/noosa/BitmapText.java b/SPD-classes/src/main/java/com/watabou/noosa/BitmapText.java
index 6306a9e8d..7a2acd37d 100644
--- a/SPD-classes/src/main/java/com/watabou/noosa/BitmapText.java
+++ b/SPD-classes/src/main/java/com/watabou/noosa/BitmapText.java
@@ -334,7 +334,6 @@ public class BitmapText extends Visual {
 			lineHeight = baseLine = height( frames.get( chars.charAt( 0 ) ) );
 		}
 		
-		//FIXME
 		private boolean colorNotMatch(Pixmap pixmap, int x, int y, int color) {
 			int pixel = pixmap.getPixel(x, y);
 			if ((pixel & 0xFF) == 0) {
diff --git a/SPD-classes/src/main/java/com/watabou/utils/FileUtils.java b/SPD-classes/src/main/java/com/watabou/utils/FileUtils.java
index 171fb9566..85909c50f 100644
--- a/SPD-classes/src/main/java/com/watabou/utils/FileUtils.java
+++ b/SPD-classes/src/main/java/com/watabou/utils/FileUtils.java
@@ -29,7 +29,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 
-//TODO should consider migrating away from use of File.java here. Can probably just use strings
 public class FileUtils {
 	
 	// Files