diff --git a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/DexBackedTypedExceptionHandler.java b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/DexBackedTypedExceptionHandler.java
index cb3d9fb8..791ffbe6 100644
--- a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/DexBackedTypedExceptionHandler.java
+++ b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/DexBackedTypedExceptionHandler.java
@@ -31,9 +31,6 @@
 
 package org.jf.dexlib2.dexbacked;
 
-import org.jf.dexlib2.base.BaseExceptionHandler;
-import org.jf.dexlib2.iface.ExceptionHandler;
-
 import javax.annotation.Nonnull;
 
 public class DexBackedTypedExceptionHandler extends DexBackedExceptionHandler {
@@ -42,7 +39,6 @@ public class DexBackedTypedExceptionHandler extends DexBackedExceptionHandler {
     private final int handlerCodeAddress;
 
     public DexBackedTypedExceptionHandler(@Nonnull DexReader reader) {
-        // TODO: verify dalvik doesn't accept an exception handler that points in the middle of an instruction
         this.dexFile = reader.dexBuf;
         this.typeId = reader.readSmallUleb128();
         this.handlerCodeAddress = reader.readSmallUleb128();
diff --git a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/instruction/DexBackedInstruction35c.java b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/instruction/DexBackedInstruction35c.java
index a6ee413a..6f80747c 100644
--- a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/instruction/DexBackedInstruction35c.java
+++ b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/instruction/DexBackedInstruction35c.java
@@ -48,7 +48,6 @@ public class DexBackedInstruction35c extends DexBackedInstruction implements Ins
     }
 
     @Override public int getRegisterCount() {
-        //TODO: make sure dalvik verifies that this is in the correct range
         return NibbleUtils.extractHighUnsignedNibble(dexFile.readUbyte(instructionStart + 1));
     }
 
diff --git a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/instruction/DexBackedInstruction35mi.java b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/instruction/DexBackedInstruction35mi.java
index c80035e5..5e705e67 100644
--- a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/instruction/DexBackedInstruction35mi.java
+++ b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/instruction/DexBackedInstruction35mi.java
@@ -46,7 +46,6 @@ public class DexBackedInstruction35mi extends DexBackedInstruction implements In
     }
 
     @Override public int getRegisterCount() {
-        //TODO: make sure dalvik verifies that this is in the correct range
         return NibbleUtils.extractHighUnsignedNibble(dexFile.readUbyte(instructionStart + 1));
     }
 
diff --git a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/instruction/DexBackedInstruction35ms.java b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/instruction/DexBackedInstruction35ms.java
index 2d759397..06088c50 100644
--- a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/instruction/DexBackedInstruction35ms.java
+++ b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/instruction/DexBackedInstruction35ms.java
@@ -46,7 +46,6 @@ public class DexBackedInstruction35ms extends DexBackedInstruction implements In
     }
 
     @Override public int getRegisterCount() {
-        //TODO: make sure dalvik verifies that this is in the correct range
         return NibbleUtils.extractHighUnsignedNibble(dexFile.readUbyte(instructionStart + 1));
     }
 
diff --git a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/util/ParameterIterator.java b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/util/ParameterIterator.java
index 8342a0b4..333eaa7c 100644
--- a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/util/ParameterIterator.java
+++ b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/util/ParameterIterator.java
@@ -35,7 +35,6 @@ import com.google.common.collect.ImmutableSet;
 import org.jf.dexlib2.base.BaseMethodParameter;
 import org.jf.dexlib2.iface.Annotation;
 import org.jf.dexlib2.iface.MethodParameter;
-import org.jf.util.ExceptionWithContext;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -51,10 +50,6 @@ public class ParameterIterator implements Iterator<MethodParameter> {
     public ParameterIterator(@Nonnull List<? extends CharSequence> parameterTypes,
                              @Nonnull List<? extends Set<? extends Annotation>> parameterAnnotations,
                              @Nonnull Iterator<String> parameterNames) {
-        // TODO: verify if dalvik allows this
-        if (parameterAnnotations.size() > parameterTypes.size()) {
-            throw new ExceptionWithContext("Too many parameter annotations");
-        }
         this.parameterTypes = parameterTypes.iterator();
         this.parameterAnnotations = parameterAnnotations.iterator();
         this.parameterNames = parameterNames;
diff --git a/dexlib2/src/main/java/org/jf/dexlib2/immutable/instruction/ImmutableInstruction.java b/dexlib2/src/main/java/org/jf/dexlib2/immutable/instruction/ImmutableInstruction.java
index 1e8fef81..2916aef1 100644
--- a/dexlib2/src/main/java/org/jf/dexlib2/immutable/instruction/ImmutableInstruction.java
+++ b/dexlib2/src/main/java/org/jf/dexlib2/immutable/instruction/ImmutableInstruction.java
@@ -46,7 +46,6 @@ public abstract class ImmutableInstruction implements Instruction {
 
     protected ImmutableInstruction(@Nonnull Opcode opcode) {
         this.opcode = opcode;
-        //TODO: check performance. Move into subclasses if needed, where we can access the field directly
         Preconditions.checkFormat(opcode, getFormat());
     }