Index: java/net/deterlab/abac/GENICredential.java
===================================================================
--- java/net/deterlab/abac/GENICredential.java	(revision 61f21c5edc41e5de819dd3b8a28651883c5685f1)
+++ java/net/deterlab/abac/GENICredential.java	(revision 7b33c9b584e09381bd205bd0aee336833e7c4c81)
@@ -39,13 +39,6 @@
  */
 public class GENICredential extends Credential implements Comparable {
-    /** The role at the head */
-    protected Role m_head
-    /** The role at the tail */;
-    protected Role m_tail;
     /** The signed XML representing this credential */
     protected Document doc;
-    /** The identity that issued the certificate */
-    protected Identity id;
-
 
     /**
@@ -571,73 +564,8 @@
 
     /**
-     * Two credentials are the same if their roles are the same.
-     * @param o an Object to compare
-     * @return true if the Credentials have the Roles 
-     */
-    public boolean equals(Object o) {
-	if ( o instanceof Credential ) {
-	    Credential c = (Credential) o;
-
-	    if (m_head == null || m_tail == null ) return false;
-	    else return (m_head.equals(c.head()) && m_tail.equals(c.tail()));
-	}
-	else return false;
-    }
-
-    /**
-     * Allow credentials to be compared.  They are ordered by their Roles, head
-     * then tail.
-     * @param o an Object to compare
-     * @return -1 if this Credential is before, 0 if they are the same, and 1
-     *		    if this Credential is after the given object.
-     */
-    public int compareTo(Object o) {
-	if (o instanceof Credential) {
-	    Credential c = (Credential) o;
-
-	    if (head().equals(c.head())) return tail().compareTo(c.tail());
-	    else return head().compareTo(c.head());
-	}
-	else return 1;
-    }
-
-
-    /**
-     * Get the head role from the credential.
-     * @return the Role in the head
-     */
-    public Role head() { return m_head; }
-
-    /**
-     * Get the tail role from the credential
-     * @return the Role in the tail
-     */
-    public Role tail() { return m_tail; }
-
-    /**
      * Gets the cert associated with this credential (if any).
      * @return the attribute cert associated with this credential (if any).
      */
     public Document GENIcert() { return doc; }
-
-    /**
-     * Turn the credential into string form. The format is head &lt;- tail. For
-     * example: A.r1 &lt;- B.r2.r3.  Principal names are key identifiers.
-     * @return the string form
-     */
-    public String toString() {
-        return m_head + " <- " + m_tail;
-    }
-
-    /**
-     * Turn the credential into string form. The format is head &lt;- tail. For
-     * example: A.r1 &lt;- B.r2.r3.  Principal names are shortened to menmonics
-     * if the Context knows the identity.
-     * @param c the Context to translate names in
-     * @return the string form
-     */
-    public String simpleString(Context c) {
-	return m_head.simpleString(c) + " <- " + m_tail.simpleString(c);
-    }
 
     /**
@@ -663,9 +591,8 @@
 	}
     }
-
     /**
      * Output the signed GENI ABAC certificate associated with this
-     * Credential to the filename given.
-     * @param fn a String containing the output filename
+     * Credential to the OutputStream.
+     * @param fn a String, the file name on which to write
      * @throws IOException if there is an error writing.
      */
@@ -681,21 +608,3 @@
     public boolean hasCertificate() { return doc != null; }
 
-    /**
-     * Return the Identity that issued the underlying certificate.  A jabac
-     * extension.
-     * @return the Identity that issued the underlying certificate.
-     */
-    public Identity issuer() { return id; }
-    /**
-     * Return the X509Certificate that issued the underlying certificate.
-     * @return the X509Certificate that issued the underlying certificate.
-     */
-    public X509Certificate issuerCert() { return id.getCertificate(); }
-    /**
-     * Return the X509V2AttributeCertificate that underlys the Credential
-     * @return the X509V2AttributeCertificate that underlys the Credential.
-    public X509V2AttributeCertificate attributeCert() { return ac; }
-     */
-
-
 }
