diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/ByteCode.java b/src/main/java/org/apache/harmony/unpack200/bytecode/ByteCode.java
index cc4d0e1..7ce6683 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/ByteCode.java
+++ b/src/main/java/org/apache/harmony/unpack200/bytecode/ByteCode.java
@@ -100,10 +100,6 @@ public class ByteCode extends ClassFileEntry {
         return getByteCodeForm().getOpcode();
     }
 
-    public int getOperandType() {
-        return getByteCodeForm().getOperandType();
-    }
-
     private boolean hashcodeComputed;
     private int cachedHashCode;
 
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ByteCodeForm.java b/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ByteCodeForm.java
index 62250d0..875b2b3 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ByteCodeForm.java
+++ b/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ByteCodeForm.java
@@ -23,39 +23,7 @@ import org.apache.harmony.unpack200.bytecode.ByteCode;
 import org.apache.harmony.unpack200.bytecode.CodeAttribute;
 import org.apache.harmony.unpack200.bytecode.OperandManager;
 
-public class ByteCodeForm {
-
-    // Operand types. Those with no operands and
-    // those with operands on the operand stack are
-    // treated similarly. These types are used to
-    // distinguish different kinds of non-stack
-    // bytecode operands
-    protected static final int TYPE_NONE = 0;
-    protected static final int TYPE_BYTE = 1;
-    protected static final int TYPE_SHORT = 2;
-    protected static final int TYPE_INTREF = 3;
-    protected static final int TYPE_FLOATREF = 4;
-    protected static final int TYPE_STRINGREF = 5;
-    protected static final int TYPE_CLASSREF = 6;
-    protected static final int TYPE_LONG = 7;
-    protected static final int TYPE_DOUBLE = 8;
-    protected static final int TYPE_LOCAL = 9;
-    protected static final int TYPE_LABEL = 10;
-    protected static final int TYPE_FIELDREF = 11;
-    protected static final int TYPE_METHODREF = 12;
-    protected static final int TYPE_IMETHODREF = 13;
-    protected static final int TYPE_WIDE = 14;
-    protected static final int TYPE_IINC = 15;
-    protected static final int TYPE_SWITCH = 16;
-    protected static final int TYPE_MULTIANEWARRAY = 17;
-    protected static final int TYPE_THISFIELDREF = 18;
-    protected static final int TYPE_THISMETHODREF = 19;
-    protected static final int TYPE_SUPERFIELDREF = 20;
-    protected static final int TYPE_SUPERMETHODREF = 21;
-    protected static final int TYPE_THISINITMETHODREF = 22;
-    protected static final int TYPE_SUPERINITMETHODREF = 23;
-    protected static final int TYPE_NEWINITMETHODREF = 24;
-    protected static final int TYPE_NEWCLASSREF = 25;
+public abstract class ByteCodeForm {
 
     protected static final boolean WIDENED = true;
 
@@ -480,13 +448,8 @@ public class ByteCodeForm {
         return (ByteCodeForm) byteCodeArray[opcode];
     }
 
-    public static ByteCodeForm get(String name) {
-        return (ByteCodeForm) byteCodesByName.get(name);
-    }
-
     public String toString() {
-        return this.getClass().getName() + "(" + getName() + ":"
-                + getOperandType() + ")";
+        return this.getClass().getName() + "(" + getName() + ")";
     }
 
     public int getOpcode() {
@@ -497,10 +460,6 @@ public class ByteCodeForm {
         return name;
     }
 
-    public int getOperandType() {
-        return -1;
-    }
-
     public int[] getRewrite() {
         return rewrite;
     }
@@ -523,106 +482,6 @@ public class ByteCodeForm {
         return false;
     }
 
-    public boolean hasByteOperand() {
-        return false;
-    }
-
-    public boolean hasShortOperand() {
-        return false;
-    }
-
-    public boolean hasIntRefOperand() {
-        return false;
-    }
-
-    public boolean hasFloatRefOperand() {
-        return false;
-    }
-
-    public boolean hasStringRefOperand() {
-        return false;
-    }
-
-    public boolean hasClassRefOperand() {
-        return false;
-    }
-
-    public boolean hasLongOperand() {
-        return false;
-    }
-
-    public boolean hasDoubleOperand() {
-        return false;
-    }
-
-    public boolean hasLocalOperand() {
-        return false;
-    }
-
-    public boolean hasLabelOperand() {
-        return false;
-    }
-
-    public boolean hasFieldRefOperand() {
-        return false;
-    }
-
-    public boolean hasMethodRefOperand() {
-        return false;
-    }
-
-    public boolean hasIMethodRefOperand() {
-        return false;
-    }
-
-    public boolean hasWideOperand() {
-        return false;
-    }
-
-    public boolean hasIincOperand() {
-        return false;
-    }
-
-    public boolean hasSwitchOperand() {
-        return false;
-    }
-
-    public boolean hasMultianewarrayOperand() {
-        return false;
-    }
-
-    public boolean hasThisFieldRefOperand() {
-        return false;
-    }
-
-    public boolean hasThisMethodRefOperand() {
-        return false;
-    }
-
-    public boolean hasSuperFieldRefOperand() {
-        return false;
-    }
-
-    public boolean hasSuperMethodRefOperand() {
-        return false;
-    }
-
-    public boolean hasThisInitMethodRefOperand() {
-        return false;
-    }
-
-    public boolean hasSuperInitMethodRefOperand() {
-        return false;
-    }
-
-    public boolean hasNewInitMethodRefOperand() {
-        return false;
-    }
-
-    public boolean hasInitMethodRefOperand() {
-        return false;
-    }
-
     /**
      * This method will answer true if the receiver is a multi-bytecode
      * instruction (such as aload0_putfield_super); otherwise, it will answer
@@ -657,10 +516,8 @@ public class ByteCodeForm {
      *            of the method. Used in calculating padding for some
      *            variable-length bytecodes (such as lookupswitch, tableswitch).
      */
-    public void setByteCodeOperands(ByteCode byteCode,
-            OperandManager operandManager, int codeLength) {
-        throw new Error("My subclass should have implemented this");
-    }
+    public abstract void setByteCodeOperands(ByteCode byteCode,
+            OperandManager operandManager, int codeLength);
 
     /**
      * The ByteCodeForm knows how to fix up a bytecode if it needs to be fixed
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ByteForm.java b/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ByteForm.java
index 07a3872..c2d8c54 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ByteForm.java
+++ b/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ByteForm.java
@@ -28,14 +28,6 @@ public class ByteForm extends ByteCodeForm {
         super(opcode, name, rewrite);
     }
 
-    public int getOperandType() {
-        return TYPE_BYTE;
-    }
-
-    public boolean hasByteOperand() {
-        return true;
-    }
-
     /*
      * (non-Javadoc)
      *
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ClassRefForm.java b/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ClassRefForm.java
index 71c1486..7797d05 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ClassRefForm.java
+++ b/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ClassRefForm.java
@@ -61,14 +61,6 @@ public class ClassRefForm extends ReferenceForm {
         byteCode.setNestedPositions(new int[][] { { 0, 2 } });
     }
 
-    public int getOperandType() {
-        return TYPE_CLASSREF;
-    }
-
-    public boolean hasClassRefOperand() {
-        return true;
-    }
-
     protected int getOffset(OperandManager operandManager) {
         return operandManager.nextClassRef();
     }
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/DoubleForm.java b/src/main/java/org/apache/harmony/unpack200/bytecode/forms/DoubleForm.java
index 30431f0..91d95a0 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/DoubleForm.java
+++ b/src/main/java/org/apache/harmony/unpack200/bytecode/forms/DoubleForm.java
@@ -29,14 +29,6 @@ public class DoubleForm extends ReferenceForm {
         super(opcode, name, rewrite);
     }
 
-    public int getOperandType() {
-        return TYPE_DOUBLE;
-    }
-
-    public boolean hasDoubleOperand() {
-        return true;
-    }
-
     protected int getOffset(OperandManager operandManager) {
         return operandManager.nextDoubleRef();
     }
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/FieldRefForm.java b/src/main/java/org/apache/harmony/unpack200/bytecode/forms/FieldRefForm.java
index e95544f..d3b4100 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/FieldRefForm.java
+++ b/src/main/java/org/apache/harmony/unpack200/bytecode/forms/FieldRefForm.java
@@ -29,14 +29,6 @@ public class FieldRefForm extends ReferenceForm {
         super(opcode, name, rewrite);
     }
 
-    public int getOperandType() {
-        return TYPE_FIELDREF;
-    }
-
-    public boolean hasFieldRefOperand() {
-        return true;
-    }
-
     protected int getOffset(OperandManager operandManager) {
         return operandManager.nextFieldRef();
     }
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/FloatRefForm.java b/src/main/java/org/apache/harmony/unpack200/bytecode/forms/FloatRefForm.java
index 8b1690a..2b57a07 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/FloatRefForm.java
+++ b/src/main/java/org/apache/harmony/unpack200/bytecode/forms/FloatRefForm.java
@@ -33,14 +33,6 @@ public class FloatRefForm extends SingleByteReferenceForm {
         this.widened = widened;
     }
 
-    public int getOperandType() {
-        return TYPE_FLOATREF;
-    }
-
-    public boolean hasFloatRefOperand() {
-        return true;
-    }
-
     protected int getOffset(OperandManager operandManager) {
         return operandManager.nextFloatRef();
     }
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/IMethodRefForm.java b/src/main/java/org/apache/harmony/unpack200/bytecode/forms/IMethodRefForm.java
index 9bb9be1..540e5f4 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/IMethodRefForm.java
+++ b/src/main/java/org/apache/harmony/unpack200/bytecode/forms/IMethodRefForm.java
@@ -31,14 +31,6 @@ public class IMethodRefForm extends ReferenceForm {
         super(opcode, name, rewrite);
     }
 
-    public int getOperandType() {
-        return TYPE_IMETHODREF;
-    }
-
-    public boolean hasIMethodRefOperand() {
-        return true;
-    }
-
     protected int getOffset(OperandManager operandManager) {
         return operandManager.nextIMethodRef();
     }
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/IincForm.java b/src/main/java/org/apache/harmony/unpack200/bytecode/forms/IincForm.java
index 619bb95..fe6768f 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/IincForm.java
+++ b/src/main/java/org/apache/harmony/unpack200/bytecode/forms/IincForm.java
@@ -29,14 +29,6 @@ public class IincForm extends ByteCodeForm {
         super(opcode, name, rewrite);
     }
 
-    public int getOperandType() {
-        return TYPE_IINC;
-    }
-
-    public boolean hasIincOperand() {
-        return true;
-    }
-
     /*
      * (non-Javadoc)
      *
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/InitMethodReferenceForm.java b/src/main/java/org/apache/harmony/unpack200/bytecode/forms/InitMethodReferenceForm.java
index 4d02331..3d0ae11 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/InitMethodReferenceForm.java
+++ b/src/main/java/org/apache/harmony/unpack200/bytecode/forms/InitMethodReferenceForm.java
@@ -35,10 +35,6 @@ public abstract class InitMethodReferenceForm extends
 
     protected abstract String context(OperandManager operandManager);
 
-    public boolean hasInitMethodRefOperand() {
-        return true;
-    }
-
     protected int getPoolID() {
         return SegmentConstantPool.CP_METHOD;
     }
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/IntRefForm.java b/src/main/java/org/apache/harmony/unpack200/bytecode/forms/IntRefForm.java
index 7ebca59..4256761 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/IntRefForm.java
+++ b/src/main/java/org/apache/harmony/unpack200/bytecode/forms/IntRefForm.java
@@ -34,14 +34,6 @@ public class IntRefForm extends SingleByteReferenceForm {
         this.widened = widened;
     }
 
-    public int getOperandType() {
-        return TYPE_INTREF;
-    }
-
-    public boolean hasIntRefOperand() {
-        return true;
-    }
-
     protected int getOffset(OperandManager operandManager) {
         return operandManager.nextIntRef();
     }
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/LabelForm.java b/src/main/java/org/apache/harmony/unpack200/bytecode/forms/LabelForm.java
index 66f621e..c708661 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/LabelForm.java
+++ b/src/main/java/org/apache/harmony/unpack200/bytecode/forms/LabelForm.java
@@ -37,14 +37,6 @@ public class LabelForm extends ByteCodeForm {
         this.widened = widened;
     }
 
-    public int getOperandType() {
-        return TYPE_LABEL;
-    }
-
-    public boolean hasLabelOperand() {
-        return true;
-    }
-
     /*
      * (non-Javadoc)
      *
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/LocalForm.java b/src/main/java/org/apache/harmony/unpack200/bytecode/forms/LocalForm.java
index 40515ca..85c70d4 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/LocalForm.java
+++ b/src/main/java/org/apache/harmony/unpack200/bytecode/forms/LocalForm.java
@@ -34,14 +34,6 @@ public class LocalForm extends ByteCodeForm {
         super(opcode, name, rewrite);
     }
 
-    public int getOperandType() {
-        return TYPE_LOCAL;
-    }
-
-    public boolean hasLocalOperand() {
-        return true;
-    }
-
     /*
      * (non-Javadoc)
      *
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/LongForm.java b/src/main/java/org/apache/harmony/unpack200/bytecode/forms/LongForm.java
index 63c1b17..22326ae 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/LongForm.java
+++ b/src/main/java/org/apache/harmony/unpack200/bytecode/forms/LongForm.java
@@ -29,14 +29,6 @@ public class LongForm extends ReferenceForm {
         super(opcode, name, rewrite);
     }
 
-    public int getOperandType() {
-        return TYPE_LONG;
-    }
-
-    public boolean hasLongOperand() {
-        return true;
-    }
-
     protected int getOffset(OperandManager operandManager) {
         return operandManager.nextLongRef();
     }
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/MethodRefForm.java b/src/main/java/org/apache/harmony/unpack200/bytecode/forms/MethodRefForm.java
index 916141b..56c8408 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/MethodRefForm.java
+++ b/src/main/java/org/apache/harmony/unpack200/bytecode/forms/MethodRefForm.java
@@ -31,14 +31,6 @@ public class MethodRefForm extends ReferenceForm {
         super(opcode, name, rewrite);
     }
 
-    public int getOperandType() {
-        return TYPE_METHODREF;
-    }
-
-    public boolean hasMethodRefOperand() {
-        return true;
-    }
-
     protected int getOffset(OperandManager operandManager) {
         return operandManager.nextMethodRef();
     }
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/MultiANewArrayForm.java b/src/main/java/org/apache/harmony/unpack200/bytecode/forms/MultiANewArrayForm.java
index 90b0924..30688aa 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/MultiANewArrayForm.java
+++ b/src/main/java/org/apache/harmony/unpack200/bytecode/forms/MultiANewArrayForm.java
@@ -31,18 +31,6 @@ public class MultiANewArrayForm extends ClassRefForm {
         super(opcode, name, rewrite);
     }
 
-    public int getOperandType() {
-        return TYPE_MULTIANEWARRAY;
-    }
-
-    public boolean hasMultianewarrayOperand() {
-        return true;
-    }
-
-    public boolean hasClassRefOperand() {
-        return false;
-    }
-
     /*
      * (non-Javadoc)
      *
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/NewInitMethodRefForm.java b/src/main/java/org/apache/harmony/unpack200/bytecode/forms/NewInitMethodRefForm.java
index e0e80fc..5b70fc5 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/NewInitMethodRefForm.java
+++ b/src/main/java/org/apache/harmony/unpack200/bytecode/forms/NewInitMethodRefForm.java
@@ -32,14 +32,6 @@ public class NewInitMethodRefForm extends InitMethodReferenceForm {
         super(opcode, name, rewrite);
     }
 
-    public int getOperandType() {
-        return TYPE_NEWINITMETHODREF;
-    }
-
-    public boolean hasNewInitMethodRefOperand() {
-        return true;
-    }
-
     protected String context(OperandManager operandManager) {
         final String result = operandManager.getNewClass();
         return result;
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/NoArgumentForm.java b/src/main/java/org/apache/harmony/unpack200/bytecode/forms/NoArgumentForm.java
index e3a9a09..8b1f315 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/NoArgumentForm.java
+++ b/src/main/java/org/apache/harmony/unpack200/bytecode/forms/NoArgumentForm.java
@@ -30,14 +30,6 @@ public class NoArgumentForm extends ByteCodeForm {
         super(opcode, name);
     }
 
-    public int getOperandType() {
-        return TYPE_NONE;
-    }
-
-    public boolean hasNoOperand() {
-        return true;
-    }
-
     /*
      * (non-Javadoc)
      *
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ShortForm.java b/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ShortForm.java
index aab12ef..96e7cfb 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ShortForm.java
+++ b/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ShortForm.java
@@ -28,14 +28,6 @@ public class ShortForm extends ByteCodeForm {
         super(opcode, name, rewrite);
     }
 
-    public int getOperandType() {
-        return TYPE_SHORT;
-    }
-
-    public boolean hasShortOperand() {
-        return true;
-    }
-
     /*
      * (non-Javadoc)
      *
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/StringRefForm.java b/src/main/java/org/apache/harmony/unpack200/bytecode/forms/StringRefForm.java
index f696a22..0692cd2 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/StringRefForm.java
+++ b/src/main/java/org/apache/harmony/unpack200/bytecode/forms/StringRefForm.java
@@ -38,14 +38,6 @@ public class StringRefForm extends SingleByteReferenceForm {
         this.widened = widened;
     }
 
-    public int getOperandType() {
-        return TYPE_STRINGREF;
-    }
-
-    public boolean hasStringRefOperand() {
-        return true;
-    }
-
     protected int getOffset(OperandManager operandManager) {
         return operandManager.nextStringRef();
     }
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SuperFieldRefForm.java b/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SuperFieldRefForm.java
index 5d2b38c..433245a 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SuperFieldRefForm.java
+++ b/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SuperFieldRefForm.java
@@ -31,14 +31,6 @@ public class SuperFieldRefForm extends ClassSpecificReferenceForm {
         super(opcode, name, rewrite);
     }
 
-    public int getOperandType() {
-        return TYPE_SUPERFIELDREF;
-    }
-
-    public boolean hasSuperFieldRefOperand() {
-        return true;
-    }
-
     protected int getOffset(OperandManager operandManager) {
         return operandManager.nextSuperFieldRef();
     }
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SuperInitMethodRefForm.java b/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SuperInitMethodRefForm.java
index e3a2c39..aca3882 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SuperInitMethodRefForm.java
+++ b/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SuperInitMethodRefForm.java
@@ -26,14 +26,6 @@ public class SuperInitMethodRefForm extends InitMethodReferenceForm {
         super(opcode, name, rewrite);
     }
 
-    public int getOperandType() {
-        return TYPE_SUPERINITMETHODREF;
-    }
-
-    public boolean hasSuperInitMethodRefOperand() {
-        return true;
-    }
-
     protected String context(
             org.apache.harmony.unpack200.bytecode.OperandManager operandManager) {
         return operandManager.getSuperClass();
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SuperMethodRefForm.java b/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SuperMethodRefForm.java
index d6e9227..16628aa 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SuperMethodRefForm.java
+++ b/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SuperMethodRefForm.java
@@ -31,14 +31,6 @@ public class SuperMethodRefForm extends ClassSpecificReferenceForm {
         super(opcode, name, rewrite);
     }
 
-    public int getOperandType() {
-        return TYPE_SUPERMETHODREF;
-    }
-
-    public boolean hasSuperMethodRefOperand() {
-        return true;
-    }
-
     protected int getOffset(OperandManager operandManager) {
         return operandManager.nextSuperMethodRef();
     }
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SwitchForm.java b/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SwitchForm.java
index 486eb42..b2287c5 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SwitchForm.java
+++ b/src/main/java/org/apache/harmony/unpack200/bytecode/forms/SwitchForm.java
@@ -30,14 +30,6 @@ public abstract class SwitchForm extends VariableInstructionForm {
         super(opcode, name, rewrite);
     }
 
-    public int getOperandType() {
-        return TYPE_SWITCH;
-    }
-
-    public boolean hasSwitchOperand() {
-        return true;
-    }
-
     /*
      * (non-Javadoc)
      *
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ThisFieldRefForm.java b/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ThisFieldRefForm.java
index a297a9f..488cf03 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ThisFieldRefForm.java
+++ b/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ThisFieldRefForm.java
@@ -31,14 +31,6 @@ public class ThisFieldRefForm extends ClassSpecificReferenceForm {
         super(opcode, name, rewrite);
     }
 
-    public int getOperandType() {
-        return TYPE_THISFIELDREF;
-    }
-
-    public boolean hasThisFieldRefOperand() {
-        return true;
-    }
-
     protected int getOffset(OperandManager operandManager) {
         return operandManager.nextThisFieldRef();
     }
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ThisInitMethodRefForm.java b/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ThisInitMethodRefForm.java
index 6796c58..3393244 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ThisInitMethodRefForm.java
+++ b/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ThisInitMethodRefForm.java
@@ -28,14 +28,6 @@ public class ThisInitMethodRefForm extends InitMethodReferenceForm {
         super(opcode, name, rewrite);
     }
 
-    public int getOperandType() {
-        return TYPE_THISINITMETHODREF;
-    }
-
-    public boolean hasThisInitMethodRefOperand() {
-        return true;
-    }
-
     protected String context(OperandManager operandManager) {
         return operandManager.getCurrentClass();
     }
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ThisMethodRefForm.java b/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ThisMethodRefForm.java
index fa38efd..ae7d7b8 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ThisMethodRefForm.java
+++ b/src/main/java/org/apache/harmony/unpack200/bytecode/forms/ThisMethodRefForm.java
@@ -31,14 +31,6 @@ public class ThisMethodRefForm extends ClassSpecificReferenceForm {
         super(opcode, name, rewrite);
     }
 
-    public int getOperandType() {
-        return TYPE_THISMETHODREF;
-    }
-
-    public boolean hasThisMethodRefOperand() {
-        return true;
-    }
-
     protected int getOffset(OperandManager operandManager) {
         return operandManager.nextThisMethodRef();
     }
diff --git a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/WideForm.java b/src/main/java/org/apache/harmony/unpack200/bytecode/forms/WideForm.java
index eaa1c6f..b819154 100644
--- a/src/main/java/org/apache/harmony/unpack200/bytecode/forms/WideForm.java
+++ b/src/main/java/org/apache/harmony/unpack200/bytecode/forms/WideForm.java
@@ -34,14 +34,6 @@ public class WideForm extends VariableInstructionForm {
         super(opcode, name, rewrite);
     }
 
-    public int getOperandType() {
-        return TYPE_WIDE;
-    }
-
-    public boolean hasWideOperand() {
-        return true;
-    }
-
     /*
      * (non-Javadoc)
      *