diff --git a/src/main/java/org/JesusFreke/dexlib/CodeItem.java b/src/main/java/org/JesusFreke/dexlib/CodeItem.java
index 07c39b53..f78d91cd 100644
--- a/src/main/java/org/JesusFreke/dexlib/CodeItem.java
+++ b/src/main/java/org/JesusFreke/dexlib/CodeItem.java
@@ -103,11 +103,6 @@ public class CodeItem extends OffsettedItem<CodeItem> {
         };
     }
 
-    //TODO: take out
-    public void writeTo(Output out) {
-        super.writeTo(out);
-    }
-
     protected int getAlignment() {
         return 4;
     }
diff --git a/src/main/java/org/JesusFreke/dexlib/Item.java b/src/main/java/org/JesusFreke/dexlib/Item.java
index f80a1ff7..d3a4c4a8 100644
--- a/src/main/java/org/JesusFreke/dexlib/Item.java
+++ b/src/main/java/org/JesusFreke/dexlib/Item.java
@@ -53,9 +53,6 @@ public abstract class Item<T extends Item> {
     public int place(int index, int offset) {
         offset = alignOffset(offset);
 
-        //TODO: take out
-        System.out.println("Placing item type " + getItemType().getTypeName() + " at offset " + ((Integer)offset).toString());
-
         this.offset = offset;
 
         Field[] fields = getFields();
@@ -75,9 +72,6 @@ public abstract class Item<T extends Item> {
     public void writeTo(Output out) {
         out.alignTo(getAlignment());
 
-        //TODO: take out
-        System.out.println("Writing item type " + getItemType().getTypeName() + " at offset " + ((Integer)out.getCursor()).toString());
-
         if (out.getCursor() != offset) {
             throw new RuntimeException("Item is being written somewhere other than where it was placed"); 
         }
diff --git a/src/main/java/org/JesusFreke/dexlib/OffsettedItemReference.java b/src/main/java/org/JesusFreke/dexlib/OffsettedItemReference.java
index 605a1096..b1047297 100644
--- a/src/main/java/org/JesusFreke/dexlib/OffsettedItemReference.java
+++ b/src/main/java/org/JesusFreke/dexlib/OffsettedItemReference.java
@@ -55,9 +55,6 @@ public class OffsettedItemReference<T extends OffsettedItem<T>> extends
             throw new RuntimeException("Trying to write reference to an item that hasn't been placed.");
         }
         
-        /*if (out.getCursor() != underlyingField.getCachedValue()) {
-            throw new RuntimeException("Trying to write a reference in a difference location from where it was placed");
-        }*/
         //TODO: this is a hack to force it to reload the correct offset value
         if (item == null) {
             underlyingField.cacheValue(0);
diff --git a/src/main/java/org/JesusFreke/dexlib/code/Format/SparseSwitchData.java b/src/main/java/org/JesusFreke/dexlib/code/Format/SparseSwitchData.java
index e38a0815..39726ecc 100644
--- a/src/main/java/org/JesusFreke/dexlib/code/Format/SparseSwitchData.java
+++ b/src/main/java/org/JesusFreke/dexlib/code/Format/SparseSwitchData.java
@@ -55,7 +55,6 @@ public class SparseSwitchData
         bytes = new byte[targets.length * 8 + 4];
         int position = 8;
 
-        //TODO: should we throw an error if there are no switch elements?
         if (targets.length > 0) {
             int key = keys[0];
             bytes[4] = (byte)key;
diff --git a/src/main/java/org/JesusFreke/dexlib/code/Instruction.java b/src/main/java/org/JesusFreke/dexlib/code/Instruction.java
index d355714c..6a60decd 100644
--- a/src/main/java/org/JesusFreke/dexlib/code/Instruction.java
+++ b/src/main/java/org/JesusFreke/dexlib/code/Instruction.java
@@ -32,8 +32,6 @@ import org.JesusFreke.dexlib.*;
 import org.JesusFreke.dexlib.util.Input;
 import org.JesusFreke.dexlib.util.Output;
 
-//TODO: need to implement the "special" bytecode types, for switches etc.
-
 public final class Instruction implements Field<Instruction> {
     private DexFile dexFile;
     private byte[] bytes;