Move the implementations of methods in Role to RoleImpl, to reduce duplication
in the RoleImpl subclasses. Reduces the lines of source code in aria/client by 65%.

Review at http://gwt-code-reviews.appspot.com/1808804

Review by: atincheva@google.com

git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@11220 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/user/src/com/google/gwt/aria/client/AlertRole.java b/user/src/com/google/gwt/aria/client/AlertRole.java
index 574a8fe..f053fa1 100644
--- a/user/src/com/google/gwt/aria/client/AlertRole.java
+++ b/user/src/com/google/gwt/aria/client/AlertRole.java
@@ -17,7 +17,6 @@
 // This is auto-generated code.  Do not manually edit! //
 /////////////////////////////////////////////////////////
 
-
 /**
  * A type that represents the <a href="http://www.w3.org/TR/wai-aria/roles#alert">alert</a>
  * role in the ARIA specification.
diff --git a/user/src/com/google/gwt/aria/client/AlertRoleImpl.java b/user/src/com/google/gwt/aria/client/AlertRoleImpl.java
index b9b00cb..528ffb2 100644
--- a/user/src/com/google/gwt/aria/client/AlertRoleImpl.java
+++ b/user/src/com/google/gwt/aria/client/AlertRoleImpl.java
@@ -28,272 +28,17 @@
   }
 
   @Override
-  public String getAriaAtomicProperty(Element element) {
-    return Property.ATOMIC.get(element);
-  }
-
-  @Override
-  public String getAriaBusyState(Element element) {
-    return State.BUSY.get(element);
-  }
-
-  @Override
-  public String getAriaControlsProperty(Element element) {
-    return Property.CONTROLS.get(element);
-  }
-
-  @Override
-  public String getAriaDescribedbyProperty(Element element) {
-    return Property.DESCRIBEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaDisabledState(Element element) {
-    return State.DISABLED.get(element);
-  }
-
-  @Override
-  public String getAriaDropeffectProperty(Element element) {
-    return Property.DROPEFFECT.get(element);
-  }
-
-  @Override
   public String getAriaExpandedState(Element element) {
     return State.EXPANDED.get(element);
   }
 
   @Override
-  public String getAriaFlowtoProperty(Element element) {
-    return Property.FLOWTO.get(element);
-  }
-
-  @Override
-  public String getAriaGrabbedState(Element element) {
-    return State.GRABBED.get(element);
-  }
-
-  @Override
-  public String getAriaHaspopupProperty(Element element) {
-    return Property.HASPOPUP.get(element);
-  }
-
-  @Override
-  public String getAriaHiddenState(Element element) {
-    return State.HIDDEN.get(element);
-  }
-
-  @Override
-  public String getAriaInvalidState(Element element) {
-    return State.INVALID.get(element);
-  }
-
-  @Override
-  public String getAriaLabelledbyProperty(Element element) {
-    return Property.LABELLEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaLabelProperty(Element element) {
-    return Property.LABEL.get(element);
-  }
-
-  @Override
-  public String getAriaLiveProperty(Element element) {
-    return Property.LIVE.get(element);
-  }
-
-  @Override
-  public String getAriaOwnsProperty(Element element) {
-    return Property.OWNS.get(element);
-  }
-
-  @Override
-  public String getAriaRelevantProperty(Element element) {
-    return Property.RELEVANT.get(element);
-  }
-
-  @Override
-  public String getTabindexExtraAttribute(Element element) {
-    return ExtraAttribute.TABINDEX.get(element);
-  }
-
-  @Override
-  public void removeAriaAtomicProperty(Element element) {
-    Property.ATOMIC.remove(element);
-  }
-
-  @Override
-  public void removeAriaBusyState(Element element) {
-    State.BUSY.remove(element);
-  }
-
-  @Override
-  public void removeAriaControlsProperty(Element element) {
-    Property.CONTROLS.remove(element);
-  }
-
-  @Override
-  public void removeAriaDescribedbyProperty(Element element) {
-    Property.DESCRIBEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaDisabledState(Element element) {
-    State.DISABLED.remove(element);
-  }
-
-  @Override
-  public void removeAriaDropeffectProperty(Element element) {
-    Property.DROPEFFECT.remove(element);
-  }
-
-  @Override
   public void removeAriaExpandedState(Element element) {
     State.EXPANDED.remove(element);
   }
 
   @Override
-  public void removeAriaFlowtoProperty(Element element) {
-    Property.FLOWTO.remove(element);
-  }
-
-  @Override
-  public void removeAriaGrabbedState(Element element) {
-    State.GRABBED.remove(element);
-  }
-
-  @Override
-  public void removeAriaHaspopupProperty(Element element) {
-    Property.HASPOPUP.remove(element);
-  }
-
-  @Override
-  public void removeAriaHiddenState(Element element) {
-    State.HIDDEN.remove(element);
-  }
-
-  @Override
-  public void removeAriaInvalidState(Element element) {
-    State.INVALID.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelledbyProperty(Element element) {
-    Property.LABELLEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelProperty(Element element) {
-    Property.LABEL.remove(element);
-  }
-
-  @Override
-  public void removeAriaLiveProperty(Element element) {
-    Property.LIVE.remove(element);
-  }
-
-  @Override
-  public void removeAriaOwnsProperty(Element element) {
-    Property.OWNS.remove(element);
-  }
-
-  @Override
-  public void removeAriaRelevantProperty(Element element) {
-    Property.RELEVANT.remove(element);
-  }
-
-  @Override
-  public void removeTabindexExtraAttribute(Element element) {
-    ExtraAttribute.TABINDEX.remove(element);
-  }
-
-  @Override
-  public void setAriaAtomicProperty(Element element, boolean value) {
-    Property.ATOMIC.set(element, value);
-  }
-
-  @Override
-  public void setAriaBusyState(Element element, boolean value) {
-    State.BUSY.set(element, value);
-  }
-
-  @Override
-  public void setAriaControlsProperty(Element element, IdReference... value) {
-    Property.CONTROLS.set(element, value);
-  }
-
-  @Override
-  public void setAriaDescribedbyProperty(Element element, IdReference... value) {
-    Property.DESCRIBEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaDisabledState(Element element, boolean value) {
-    State.DISABLED.set(element, value);
-  }
-
-  @Override
-  public void setAriaDropeffectProperty(Element element, DropeffectValue... value) {
-    Property.DROPEFFECT.set(element, value);
-  }
-
-  @Override
   public void setAriaExpandedState(Element element, ExpandedValue value) {
     State.EXPANDED.set(element, value);
   }
-
-  @Override
-  public void setAriaFlowtoProperty(Element element, IdReference... value) {
-    Property.FLOWTO.set(element, value);
-  }
-
-  @Override
-  public void setAriaGrabbedState(Element element, GrabbedValue value) {
-    State.GRABBED.set(element, value);
-  }
-
-  @Override
-  public void setAriaHaspopupProperty(Element element, boolean value) {
-    Property.HASPOPUP.set(element, value);
-  }
-
-  @Override
-  public void setAriaHiddenState(Element element, boolean value) {
-    State.HIDDEN.set(element, value);
-  }
-
-  @Override
-  public void setAriaInvalidState(Element element, InvalidValue value) {
-    State.INVALID.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelledbyProperty(Element element, IdReference... value) {
-    Property.LABELLEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelProperty(Element element, String value) {
-    Property.LABEL.set(element, value);
-  }
-
-  @Override
-  public void setAriaLiveProperty(Element element, LiveValue value) {
-    Property.LIVE.set(element, value);
-  }
-
-  @Override
-  public void setAriaOwnsProperty(Element element, IdReference... value) {
-    Property.OWNS.set(element, value);
-  }
-
-  @Override
-  public void setAriaRelevantProperty(Element element, RelevantValue... value) {
-    Property.RELEVANT.set(element, value);
-  }
-
-  @Override
-  public void setTabindexExtraAttribute(Element element, int value) {
-    ExtraAttribute.TABINDEX.set(element, value);
-  }
 }
diff --git a/user/src/com/google/gwt/aria/client/AlertdialogRole.java b/user/src/com/google/gwt/aria/client/AlertdialogRole.java
index 88c31d9..ab73e29 100644
--- a/user/src/com/google/gwt/aria/client/AlertdialogRole.java
+++ b/user/src/com/google/gwt/aria/client/AlertdialogRole.java
@@ -17,7 +17,6 @@
 // This is auto-generated code.  Do not manually edit! //
 /////////////////////////////////////////////////////////
 
-
 /**
  * A type that represents the <a href="http://www.w3.org/TR/wai-aria/roles#alertdialog">alertdialog</a>
  * role in the ARIA specification.
diff --git a/user/src/com/google/gwt/aria/client/AlertdialogRoleImpl.java b/user/src/com/google/gwt/aria/client/AlertdialogRoleImpl.java
index fdec37a..14f7e51 100644
--- a/user/src/com/google/gwt/aria/client/AlertdialogRoleImpl.java
+++ b/user/src/com/google/gwt/aria/client/AlertdialogRoleImpl.java
@@ -28,272 +28,17 @@
   }
 
   @Override
-  public String getAriaAtomicProperty(Element element) {
-    return Property.ATOMIC.get(element);
-  }
-
-  @Override
-  public String getAriaBusyState(Element element) {
-    return State.BUSY.get(element);
-  }
-
-  @Override
-  public String getAriaControlsProperty(Element element) {
-    return Property.CONTROLS.get(element);
-  }
-
-  @Override
-  public String getAriaDescribedbyProperty(Element element) {
-    return Property.DESCRIBEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaDisabledState(Element element) {
-    return State.DISABLED.get(element);
-  }
-
-  @Override
-  public String getAriaDropeffectProperty(Element element) {
-    return Property.DROPEFFECT.get(element);
-  }
-
-  @Override
   public String getAriaExpandedState(Element element) {
     return State.EXPANDED.get(element);
   }
 
   @Override
-  public String getAriaFlowtoProperty(Element element) {
-    return Property.FLOWTO.get(element);
-  }
-
-  @Override
-  public String getAriaGrabbedState(Element element) {
-    return State.GRABBED.get(element);
-  }
-
-  @Override
-  public String getAriaHaspopupProperty(Element element) {
-    return Property.HASPOPUP.get(element);
-  }
-
-  @Override
-  public String getAriaHiddenState(Element element) {
-    return State.HIDDEN.get(element);
-  }
-
-  @Override
-  public String getAriaInvalidState(Element element) {
-    return State.INVALID.get(element);
-  }
-
-  @Override
-  public String getAriaLabelledbyProperty(Element element) {
-    return Property.LABELLEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaLabelProperty(Element element) {
-    return Property.LABEL.get(element);
-  }
-
-  @Override
-  public String getAriaLiveProperty(Element element) {
-    return Property.LIVE.get(element);
-  }
-
-  @Override
-  public String getAriaOwnsProperty(Element element) {
-    return Property.OWNS.get(element);
-  }
-
-  @Override
-  public String getAriaRelevantProperty(Element element) {
-    return Property.RELEVANT.get(element);
-  }
-
-  @Override
-  public String getTabindexExtraAttribute(Element element) {
-    return ExtraAttribute.TABINDEX.get(element);
-  }
-
-  @Override
-  public void removeAriaAtomicProperty(Element element) {
-    Property.ATOMIC.remove(element);
-  }
-
-  @Override
-  public void removeAriaBusyState(Element element) {
-    State.BUSY.remove(element);
-  }
-
-  @Override
-  public void removeAriaControlsProperty(Element element) {
-    Property.CONTROLS.remove(element);
-  }
-
-  @Override
-  public void removeAriaDescribedbyProperty(Element element) {
-    Property.DESCRIBEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaDisabledState(Element element) {
-    State.DISABLED.remove(element);
-  }
-
-  @Override
-  public void removeAriaDropeffectProperty(Element element) {
-    Property.DROPEFFECT.remove(element);
-  }
-
-  @Override
   public void removeAriaExpandedState(Element element) {
     State.EXPANDED.remove(element);
   }
 
   @Override
-  public void removeAriaFlowtoProperty(Element element) {
-    Property.FLOWTO.remove(element);
-  }
-
-  @Override
-  public void removeAriaGrabbedState(Element element) {
-    State.GRABBED.remove(element);
-  }
-
-  @Override
-  public void removeAriaHaspopupProperty(Element element) {
-    Property.HASPOPUP.remove(element);
-  }
-
-  @Override
-  public void removeAriaHiddenState(Element element) {
-    State.HIDDEN.remove(element);
-  }
-
-  @Override
-  public void removeAriaInvalidState(Element element) {
-    State.INVALID.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelledbyProperty(Element element) {
-    Property.LABELLEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelProperty(Element element) {
-    Property.LABEL.remove(element);
-  }
-
-  @Override
-  public void removeAriaLiveProperty(Element element) {
-    Property.LIVE.remove(element);
-  }
-
-  @Override
-  public void removeAriaOwnsProperty(Element element) {
-    Property.OWNS.remove(element);
-  }
-
-  @Override
-  public void removeAriaRelevantProperty(Element element) {
-    Property.RELEVANT.remove(element);
-  }
-
-  @Override
-  public void removeTabindexExtraAttribute(Element element) {
-    ExtraAttribute.TABINDEX.remove(element);
-  }
-
-  @Override
-  public void setAriaAtomicProperty(Element element, boolean value) {
-    Property.ATOMIC.set(element, value);
-  }
-
-  @Override
-  public void setAriaBusyState(Element element, boolean value) {
-    State.BUSY.set(element, value);
-  }
-
-  @Override
-  public void setAriaControlsProperty(Element element, IdReference... value) {
-    Property.CONTROLS.set(element, value);
-  }
-
-  @Override
-  public void setAriaDescribedbyProperty(Element element, IdReference... value) {
-    Property.DESCRIBEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaDisabledState(Element element, boolean value) {
-    State.DISABLED.set(element, value);
-  }
-
-  @Override
-  public void setAriaDropeffectProperty(Element element, DropeffectValue... value) {
-    Property.DROPEFFECT.set(element, value);
-  }
-
-  @Override
   public void setAriaExpandedState(Element element, ExpandedValue value) {
     State.EXPANDED.set(element, value);
   }
-
-  @Override
-  public void setAriaFlowtoProperty(Element element, IdReference... value) {
-    Property.FLOWTO.set(element, value);
-  }
-
-  @Override
-  public void setAriaGrabbedState(Element element, GrabbedValue value) {
-    State.GRABBED.set(element, value);
-  }
-
-  @Override
-  public void setAriaHaspopupProperty(Element element, boolean value) {
-    Property.HASPOPUP.set(element, value);
-  }
-
-  @Override
-  public void setAriaHiddenState(Element element, boolean value) {
-    State.HIDDEN.set(element, value);
-  }
-
-  @Override
-  public void setAriaInvalidState(Element element, InvalidValue value) {
-    State.INVALID.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelledbyProperty(Element element, IdReference... value) {
-    Property.LABELLEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelProperty(Element element, String value) {
-    Property.LABEL.set(element, value);
-  }
-
-  @Override
-  public void setAriaLiveProperty(Element element, LiveValue value) {
-    Property.LIVE.set(element, value);
-  }
-
-  @Override
-  public void setAriaOwnsProperty(Element element, IdReference... value) {
-    Property.OWNS.set(element, value);
-  }
-
-  @Override
-  public void setAriaRelevantProperty(Element element, RelevantValue... value) {
-    Property.RELEVANT.set(element, value);
-  }
-
-  @Override
-  public void setTabindexExtraAttribute(Element element, int value) {
-    ExtraAttribute.TABINDEX.set(element, value);
-  }
 }
diff --git a/user/src/com/google/gwt/aria/client/ApplicationRole.java b/user/src/com/google/gwt/aria/client/ApplicationRole.java
index 541319b..e6e4276 100644
--- a/user/src/com/google/gwt/aria/client/ApplicationRole.java
+++ b/user/src/com/google/gwt/aria/client/ApplicationRole.java
@@ -17,7 +17,6 @@
 // This is auto-generated code.  Do not manually edit! //
 /////////////////////////////////////////////////////////
 
-
 /**
  * A type that represents the <a href="http://www.w3.org/TR/wai-aria/roles#application">application</a>
  * role in the ARIA specification.
diff --git a/user/src/com/google/gwt/aria/client/ApplicationRoleImpl.java b/user/src/com/google/gwt/aria/client/ApplicationRoleImpl.java
index 23b4e68..9bd6e71 100644
--- a/user/src/com/google/gwt/aria/client/ApplicationRoleImpl.java
+++ b/user/src/com/google/gwt/aria/client/ApplicationRoleImpl.java
@@ -28,272 +28,17 @@
   }
 
   @Override
-  public String getAriaAtomicProperty(Element element) {
-    return Property.ATOMIC.get(element);
-  }
-
-  @Override
-  public String getAriaBusyState(Element element) {
-    return State.BUSY.get(element);
-  }
-
-  @Override
-  public String getAriaControlsProperty(Element element) {
-    return Property.CONTROLS.get(element);
-  }
-
-  @Override
-  public String getAriaDescribedbyProperty(Element element) {
-    return Property.DESCRIBEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaDisabledState(Element element) {
-    return State.DISABLED.get(element);
-  }
-
-  @Override
-  public String getAriaDropeffectProperty(Element element) {
-    return Property.DROPEFFECT.get(element);
-  }
-
-  @Override
   public String getAriaExpandedState(Element element) {
     return State.EXPANDED.get(element);
   }
 
   @Override
-  public String getAriaFlowtoProperty(Element element) {
-    return Property.FLOWTO.get(element);
-  }
-
-  @Override
-  public String getAriaGrabbedState(Element element) {
-    return State.GRABBED.get(element);
-  }
-
-  @Override
-  public String getAriaHaspopupProperty(Element element) {
-    return Property.HASPOPUP.get(element);
-  }
-
-  @Override
-  public String getAriaHiddenState(Element element) {
-    return State.HIDDEN.get(element);
-  }
-
-  @Override
-  public String getAriaInvalidState(Element element) {
-    return State.INVALID.get(element);
-  }
-
-  @Override
-  public String getAriaLabelledbyProperty(Element element) {
-    return Property.LABELLEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaLabelProperty(Element element) {
-    return Property.LABEL.get(element);
-  }
-
-  @Override
-  public String getAriaLiveProperty(Element element) {
-    return Property.LIVE.get(element);
-  }
-
-  @Override
-  public String getAriaOwnsProperty(Element element) {
-    return Property.OWNS.get(element);
-  }
-
-  @Override
-  public String getAriaRelevantProperty(Element element) {
-    return Property.RELEVANT.get(element);
-  }
-
-  @Override
-  public String getTabindexExtraAttribute(Element element) {
-    return ExtraAttribute.TABINDEX.get(element);
-  }
-
-  @Override
-  public void removeAriaAtomicProperty(Element element) {
-    Property.ATOMIC.remove(element);
-  }
-
-  @Override
-  public void removeAriaBusyState(Element element) {
-    State.BUSY.remove(element);
-  }
-
-  @Override
-  public void removeAriaControlsProperty(Element element) {
-    Property.CONTROLS.remove(element);
-  }
-
-  @Override
-  public void removeAriaDescribedbyProperty(Element element) {
-    Property.DESCRIBEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaDisabledState(Element element) {
-    State.DISABLED.remove(element);
-  }
-
-  @Override
-  public void removeAriaDropeffectProperty(Element element) {
-    Property.DROPEFFECT.remove(element);
-  }
-
-  @Override
   public void removeAriaExpandedState(Element element) {
     State.EXPANDED.remove(element);
   }
 
   @Override
-  public void removeAriaFlowtoProperty(Element element) {
-    Property.FLOWTO.remove(element);
-  }
-
-  @Override
-  public void removeAriaGrabbedState(Element element) {
-    State.GRABBED.remove(element);
-  }
-
-  @Override
-  public void removeAriaHaspopupProperty(Element element) {
-    Property.HASPOPUP.remove(element);
-  }
-
-  @Override
-  public void removeAriaHiddenState(Element element) {
-    State.HIDDEN.remove(element);
-  }
-
-  @Override
-  public void removeAriaInvalidState(Element element) {
-    State.INVALID.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelledbyProperty(Element element) {
-    Property.LABELLEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelProperty(Element element) {
-    Property.LABEL.remove(element);
-  }
-
-  @Override
-  public void removeAriaLiveProperty(Element element) {
-    Property.LIVE.remove(element);
-  }
-
-  @Override
-  public void removeAriaOwnsProperty(Element element) {
-    Property.OWNS.remove(element);
-  }
-
-  @Override
-  public void removeAriaRelevantProperty(Element element) {
-    Property.RELEVANT.remove(element);
-  }
-
-  @Override
-  public void removeTabindexExtraAttribute(Element element) {
-    ExtraAttribute.TABINDEX.remove(element);
-  }
-
-  @Override
-  public void setAriaAtomicProperty(Element element, boolean value) {
-    Property.ATOMIC.set(element, value);
-  }
-
-  @Override
-  public void setAriaBusyState(Element element, boolean value) {
-    State.BUSY.set(element, value);
-  }
-
-  @Override
-  public void setAriaControlsProperty(Element element, IdReference... value) {
-    Property.CONTROLS.set(element, value);
-  }
-
-  @Override
-  public void setAriaDescribedbyProperty(Element element, IdReference... value) {
-    Property.DESCRIBEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaDisabledState(Element element, boolean value) {
-    State.DISABLED.set(element, value);
-  }
-
-  @Override
-  public void setAriaDropeffectProperty(Element element, DropeffectValue... value) {
-    Property.DROPEFFECT.set(element, value);
-  }
-
-  @Override
   public void setAriaExpandedState(Element element, ExpandedValue value) {
     State.EXPANDED.set(element, value);
   }
-
-  @Override
-  public void setAriaFlowtoProperty(Element element, IdReference... value) {
-    Property.FLOWTO.set(element, value);
-  }
-
-  @Override
-  public void setAriaGrabbedState(Element element, GrabbedValue value) {
-    State.GRABBED.set(element, value);
-  }
-
-  @Override
-  public void setAriaHaspopupProperty(Element element, boolean value) {
-    Property.HASPOPUP.set(element, value);
-  }
-
-  @Override
-  public void setAriaHiddenState(Element element, boolean value) {
-    State.HIDDEN.set(element, value);
-  }
-
-  @Override
-  public void setAriaInvalidState(Element element, InvalidValue value) {
-    State.INVALID.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelledbyProperty(Element element, IdReference... value) {
-    Property.LABELLEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelProperty(Element element, String value) {
-    Property.LABEL.set(element, value);
-  }
-
-  @Override
-  public void setAriaLiveProperty(Element element, LiveValue value) {
-    Property.LIVE.set(element, value);
-  }
-
-  @Override
-  public void setAriaOwnsProperty(Element element, IdReference... value) {
-    Property.OWNS.set(element, value);
-  }
-
-  @Override
-  public void setAriaRelevantProperty(Element element, RelevantValue... value) {
-    Property.RELEVANT.set(element, value);
-  }
-
-  @Override
-  public void setTabindexExtraAttribute(Element element, int value) {
-    ExtraAttribute.TABINDEX.set(element, value);
-  }
 }
diff --git a/user/src/com/google/gwt/aria/client/ArticleRole.java b/user/src/com/google/gwt/aria/client/ArticleRole.java
index 79fc2fc..ac134a6 100644
--- a/user/src/com/google/gwt/aria/client/ArticleRole.java
+++ b/user/src/com/google/gwt/aria/client/ArticleRole.java
@@ -17,7 +17,6 @@
 // This is auto-generated code.  Do not manually edit! //
 /////////////////////////////////////////////////////////
 
-
 /**
  * A type that represents the <a href="http://www.w3.org/TR/wai-aria/roles#article">article</a>
  * role in the ARIA specification.
diff --git a/user/src/com/google/gwt/aria/client/ArticleRoleImpl.java b/user/src/com/google/gwt/aria/client/ArticleRoleImpl.java
index ec4c6ab..ef57b8d 100644
--- a/user/src/com/google/gwt/aria/client/ArticleRoleImpl.java
+++ b/user/src/com/google/gwt/aria/client/ArticleRoleImpl.java
@@ -28,272 +28,17 @@
   }
 
   @Override
-  public String getAriaAtomicProperty(Element element) {
-    return Property.ATOMIC.get(element);
-  }
-
-  @Override
-  public String getAriaBusyState(Element element) {
-    return State.BUSY.get(element);
-  }
-
-  @Override
-  public String getAriaControlsProperty(Element element) {
-    return Property.CONTROLS.get(element);
-  }
-
-  @Override
-  public String getAriaDescribedbyProperty(Element element) {
-    return Property.DESCRIBEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaDisabledState(Element element) {
-    return State.DISABLED.get(element);
-  }
-
-  @Override
-  public String getAriaDropeffectProperty(Element element) {
-    return Property.DROPEFFECT.get(element);
-  }
-
-  @Override
   public String getAriaExpandedState(Element element) {
     return State.EXPANDED.get(element);
   }
 
   @Override
-  public String getAriaFlowtoProperty(Element element) {
-    return Property.FLOWTO.get(element);
-  }
-
-  @Override
-  public String getAriaGrabbedState(Element element) {
-    return State.GRABBED.get(element);
-  }
-
-  @Override
-  public String getAriaHaspopupProperty(Element element) {
-    return Property.HASPOPUP.get(element);
-  }
-
-  @Override
-  public String getAriaHiddenState(Element element) {
-    return State.HIDDEN.get(element);
-  }
-
-  @Override
-  public String getAriaInvalidState(Element element) {
-    return State.INVALID.get(element);
-  }
-
-  @Override
-  public String getAriaLabelledbyProperty(Element element) {
-    return Property.LABELLEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaLabelProperty(Element element) {
-    return Property.LABEL.get(element);
-  }
-
-  @Override
-  public String getAriaLiveProperty(Element element) {
-    return Property.LIVE.get(element);
-  }
-
-  @Override
-  public String getAriaOwnsProperty(Element element) {
-    return Property.OWNS.get(element);
-  }
-
-  @Override
-  public String getAriaRelevantProperty(Element element) {
-    return Property.RELEVANT.get(element);
-  }
-
-  @Override
-  public String getTabindexExtraAttribute(Element element) {
-    return ExtraAttribute.TABINDEX.get(element);
-  }
-
-  @Override
-  public void removeAriaAtomicProperty(Element element) {
-    Property.ATOMIC.remove(element);
-  }
-
-  @Override
-  public void removeAriaBusyState(Element element) {
-    State.BUSY.remove(element);
-  }
-
-  @Override
-  public void removeAriaControlsProperty(Element element) {
-    Property.CONTROLS.remove(element);
-  }
-
-  @Override
-  public void removeAriaDescribedbyProperty(Element element) {
-    Property.DESCRIBEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaDisabledState(Element element) {
-    State.DISABLED.remove(element);
-  }
-
-  @Override
-  public void removeAriaDropeffectProperty(Element element) {
-    Property.DROPEFFECT.remove(element);
-  }
-
-  @Override
   public void removeAriaExpandedState(Element element) {
     State.EXPANDED.remove(element);
   }
 
   @Override
-  public void removeAriaFlowtoProperty(Element element) {
-    Property.FLOWTO.remove(element);
-  }
-
-  @Override
-  public void removeAriaGrabbedState(Element element) {
-    State.GRABBED.remove(element);
-  }
-
-  @Override
-  public void removeAriaHaspopupProperty(Element element) {
-    Property.HASPOPUP.remove(element);
-  }
-
-  @Override
-  public void removeAriaHiddenState(Element element) {
-    State.HIDDEN.remove(element);
-  }
-
-  @Override
-  public void removeAriaInvalidState(Element element) {
-    State.INVALID.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelledbyProperty(Element element) {
-    Property.LABELLEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelProperty(Element element) {
-    Property.LABEL.remove(element);
-  }
-
-  @Override
-  public void removeAriaLiveProperty(Element element) {
-    Property.LIVE.remove(element);
-  }
-
-  @Override
-  public void removeAriaOwnsProperty(Element element) {
-    Property.OWNS.remove(element);
-  }
-
-  @Override
-  public void removeAriaRelevantProperty(Element element) {
-    Property.RELEVANT.remove(element);
-  }
-
-  @Override
-  public void removeTabindexExtraAttribute(Element element) {
-    ExtraAttribute.TABINDEX.remove(element);
-  }
-
-  @Override
-  public void setAriaAtomicProperty(Element element, boolean value) {
-    Property.ATOMIC.set(element, value);
-  }
-
-  @Override
-  public void setAriaBusyState(Element element, boolean value) {
-    State.BUSY.set(element, value);
-  }
-
-  @Override
-  public void setAriaControlsProperty(Element element, IdReference... value) {
-    Property.CONTROLS.set(element, value);
-  }
-
-  @Override
-  public void setAriaDescribedbyProperty(Element element, IdReference... value) {
-    Property.DESCRIBEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaDisabledState(Element element, boolean value) {
-    State.DISABLED.set(element, value);
-  }
-
-  @Override
-  public void setAriaDropeffectProperty(Element element, DropeffectValue... value) {
-    Property.DROPEFFECT.set(element, value);
-  }
-
-  @Override
   public void setAriaExpandedState(Element element, ExpandedValue value) {
     State.EXPANDED.set(element, value);
   }
-
-  @Override
-  public void setAriaFlowtoProperty(Element element, IdReference... value) {
-    Property.FLOWTO.set(element, value);
-  }
-
-  @Override
-  public void setAriaGrabbedState(Element element, GrabbedValue value) {
-    State.GRABBED.set(element, value);
-  }
-
-  @Override
-  public void setAriaHaspopupProperty(Element element, boolean value) {
-    Property.HASPOPUP.set(element, value);
-  }
-
-  @Override
-  public void setAriaHiddenState(Element element, boolean value) {
-    State.HIDDEN.set(element, value);
-  }
-
-  @Override
-  public void setAriaInvalidState(Element element, InvalidValue value) {
-    State.INVALID.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelledbyProperty(Element element, IdReference... value) {
-    Property.LABELLEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelProperty(Element element, String value) {
-    Property.LABEL.set(element, value);
-  }
-
-  @Override
-  public void setAriaLiveProperty(Element element, LiveValue value) {
-    Property.LIVE.set(element, value);
-  }
-
-  @Override
-  public void setAriaOwnsProperty(Element element, IdReference... value) {
-    Property.OWNS.set(element, value);
-  }
-
-  @Override
-  public void setAriaRelevantProperty(Element element, RelevantValue... value) {
-    Property.RELEVANT.set(element, value);
-  }
-
-  @Override
-  public void setTabindexExtraAttribute(Element element, int value) {
-    ExtraAttribute.TABINDEX.set(element, value);
-  }
 }
diff --git a/user/src/com/google/gwt/aria/client/BannerRole.java b/user/src/com/google/gwt/aria/client/BannerRole.java
index 6b610a8..78930af 100644
--- a/user/src/com/google/gwt/aria/client/BannerRole.java
+++ b/user/src/com/google/gwt/aria/client/BannerRole.java
@@ -17,7 +17,6 @@
 // This is auto-generated code.  Do not manually edit! //
 /////////////////////////////////////////////////////////
 
-
 /**
  * A type that represents the <a href="http://www.w3.org/TR/wai-aria/roles#banner">banner</a>
  * role in the ARIA specification.
diff --git a/user/src/com/google/gwt/aria/client/BannerRoleImpl.java b/user/src/com/google/gwt/aria/client/BannerRoleImpl.java
index b6dfbe0..c1818df 100644
--- a/user/src/com/google/gwt/aria/client/BannerRoleImpl.java
+++ b/user/src/com/google/gwt/aria/client/BannerRoleImpl.java
@@ -28,272 +28,17 @@
   }
 
   @Override
-  public String getAriaAtomicProperty(Element element) {
-    return Property.ATOMIC.get(element);
-  }
-
-  @Override
-  public String getAriaBusyState(Element element) {
-    return State.BUSY.get(element);
-  }
-
-  @Override
-  public String getAriaControlsProperty(Element element) {
-    return Property.CONTROLS.get(element);
-  }
-
-  @Override
-  public String getAriaDescribedbyProperty(Element element) {
-    return Property.DESCRIBEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaDisabledState(Element element) {
-    return State.DISABLED.get(element);
-  }
-
-  @Override
-  public String getAriaDropeffectProperty(Element element) {
-    return Property.DROPEFFECT.get(element);
-  }
-
-  @Override
   public String getAriaExpandedState(Element element) {
     return State.EXPANDED.get(element);
   }
 
   @Override
-  public String getAriaFlowtoProperty(Element element) {
-    return Property.FLOWTO.get(element);
-  }
-
-  @Override
-  public String getAriaGrabbedState(Element element) {
-    return State.GRABBED.get(element);
-  }
-
-  @Override
-  public String getAriaHaspopupProperty(Element element) {
-    return Property.HASPOPUP.get(element);
-  }
-
-  @Override
-  public String getAriaHiddenState(Element element) {
-    return State.HIDDEN.get(element);
-  }
-
-  @Override
-  public String getAriaInvalidState(Element element) {
-    return State.INVALID.get(element);
-  }
-
-  @Override
-  public String getAriaLabelledbyProperty(Element element) {
-    return Property.LABELLEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaLabelProperty(Element element) {
-    return Property.LABEL.get(element);
-  }
-
-  @Override
-  public String getAriaLiveProperty(Element element) {
-    return Property.LIVE.get(element);
-  }
-
-  @Override
-  public String getAriaOwnsProperty(Element element) {
-    return Property.OWNS.get(element);
-  }
-
-  @Override
-  public String getAriaRelevantProperty(Element element) {
-    return Property.RELEVANT.get(element);
-  }
-
-  @Override
-  public String getTabindexExtraAttribute(Element element) {
-    return ExtraAttribute.TABINDEX.get(element);
-  }
-
-  @Override
-  public void removeAriaAtomicProperty(Element element) {
-    Property.ATOMIC.remove(element);
-  }
-
-  @Override
-  public void removeAriaBusyState(Element element) {
-    State.BUSY.remove(element);
-  }
-
-  @Override
-  public void removeAriaControlsProperty(Element element) {
-    Property.CONTROLS.remove(element);
-  }
-
-  @Override
-  public void removeAriaDescribedbyProperty(Element element) {
-    Property.DESCRIBEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaDisabledState(Element element) {
-    State.DISABLED.remove(element);
-  }
-
-  @Override
-  public void removeAriaDropeffectProperty(Element element) {
-    Property.DROPEFFECT.remove(element);
-  }
-
-  @Override
   public void removeAriaExpandedState(Element element) {
     State.EXPANDED.remove(element);
   }
 
   @Override
-  public void removeAriaFlowtoProperty(Element element) {
-    Property.FLOWTO.remove(element);
-  }
-
-  @Override
-  public void removeAriaGrabbedState(Element element) {
-    State.GRABBED.remove(element);
-  }
-
-  @Override
-  public void removeAriaHaspopupProperty(Element element) {
-    Property.HASPOPUP.remove(element);
-  }
-
-  @Override
-  public void removeAriaHiddenState(Element element) {
-    State.HIDDEN.remove(element);
-  }
-
-  @Override
-  public void removeAriaInvalidState(Element element) {
-    State.INVALID.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelledbyProperty(Element element) {
-    Property.LABELLEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelProperty(Element element) {
-    Property.LABEL.remove(element);
-  }
-
-  @Override
-  public void removeAriaLiveProperty(Element element) {
-    Property.LIVE.remove(element);
-  }
-
-  @Override
-  public void removeAriaOwnsProperty(Element element) {
-    Property.OWNS.remove(element);
-  }
-
-  @Override
-  public void removeAriaRelevantProperty(Element element) {
-    Property.RELEVANT.remove(element);
-  }
-
-  @Override
-  public void removeTabindexExtraAttribute(Element element) {
-    ExtraAttribute.TABINDEX.remove(element);
-  }
-
-  @Override
-  public void setAriaAtomicProperty(Element element, boolean value) {
-    Property.ATOMIC.set(element, value);
-  }
-
-  @Override
-  public void setAriaBusyState(Element element, boolean value) {
-    State.BUSY.set(element, value);
-  }
-
-  @Override
-  public void setAriaControlsProperty(Element element, IdReference... value) {
-    Property.CONTROLS.set(element, value);
-  }
-
-  @Override
-  public void setAriaDescribedbyProperty(Element element, IdReference... value) {
-    Property.DESCRIBEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaDisabledState(Element element, boolean value) {
-    State.DISABLED.set(element, value);
-  }
-
-  @Override
-  public void setAriaDropeffectProperty(Element element, DropeffectValue... value) {
-    Property.DROPEFFECT.set(element, value);
-  }
-
-  @Override
   public void setAriaExpandedState(Element element, ExpandedValue value) {
     State.EXPANDED.set(element, value);
   }
-
-  @Override
-  public void setAriaFlowtoProperty(Element element, IdReference... value) {
-    Property.FLOWTO.set(element, value);
-  }
-
-  @Override
-  public void setAriaGrabbedState(Element element, GrabbedValue value) {
-    State.GRABBED.set(element, value);
-  }
-
-  @Override
-  public void setAriaHaspopupProperty(Element element, boolean value) {
-    Property.HASPOPUP.set(element, value);
-  }
-
-  @Override
-  public void setAriaHiddenState(Element element, boolean value) {
-    State.HIDDEN.set(element, value);
-  }
-
-  @Override
-  public void setAriaInvalidState(Element element, InvalidValue value) {
-    State.INVALID.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelledbyProperty(Element element, IdReference... value) {
-    Property.LABELLEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelProperty(Element element, String value) {
-    Property.LABEL.set(element, value);
-  }
-
-  @Override
-  public void setAriaLiveProperty(Element element, LiveValue value) {
-    Property.LIVE.set(element, value);
-  }
-
-  @Override
-  public void setAriaOwnsProperty(Element element, IdReference... value) {
-    Property.OWNS.set(element, value);
-  }
-
-  @Override
-  public void setAriaRelevantProperty(Element element, RelevantValue... value) {
-    Property.RELEVANT.set(element, value);
-  }
-
-  @Override
-  public void setTabindexExtraAttribute(Element element, int value) {
-    ExtraAttribute.TABINDEX.set(element, value);
-  }
 }
diff --git a/user/src/com/google/gwt/aria/client/ButtonRoleImpl.java b/user/src/com/google/gwt/aria/client/ButtonRoleImpl.java
index 5901f87..19a1cc0 100644
--- a/user/src/com/google/gwt/aria/client/ButtonRoleImpl.java
+++ b/user/src/com/google/gwt/aria/client/ButtonRoleImpl.java
@@ -28,287 +28,32 @@
   }
 
   @Override
-  public String getAriaAtomicProperty(Element element) {
-    return Property.ATOMIC.get(element);
-  }
-
-  @Override
-  public String getAriaBusyState(Element element) {
-    return State.BUSY.get(element);
-  }
-
-  @Override
-  public String getAriaControlsProperty(Element element) {
-    return Property.CONTROLS.get(element);
-  }
-
-  @Override
-  public String getAriaDescribedbyProperty(Element element) {
-    return Property.DESCRIBEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaDisabledState(Element element) {
-    return State.DISABLED.get(element);
-  }
-
-  @Override
-  public String getAriaDropeffectProperty(Element element) {
-    return Property.DROPEFFECT.get(element);
-  }
-
-  @Override
   public String getAriaExpandedState(Element element) {
     return State.EXPANDED.get(element);
   }
 
   @Override
-  public String getAriaFlowtoProperty(Element element) {
-    return Property.FLOWTO.get(element);
-  }
-
-  @Override
-  public String getAriaGrabbedState(Element element) {
-    return State.GRABBED.get(element);
-  }
-
-  @Override
-  public String getAriaHaspopupProperty(Element element) {
-    return Property.HASPOPUP.get(element);
-  }
-
-  @Override
-  public String getAriaHiddenState(Element element) {
-    return State.HIDDEN.get(element);
-  }
-
-  @Override
-  public String getAriaInvalidState(Element element) {
-    return State.INVALID.get(element);
-  }
-
-  @Override
-  public String getAriaLabelledbyProperty(Element element) {
-    return Property.LABELLEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaLabelProperty(Element element) {
-    return Property.LABEL.get(element);
-  }
-
-  @Override
-  public String getAriaLiveProperty(Element element) {
-    return Property.LIVE.get(element);
-  }
-
-  @Override
-  public String getAriaOwnsProperty(Element element) {
-    return Property.OWNS.get(element);
-  }
-
-  @Override
   public String getAriaPressedState(Element element) {
     return State.PRESSED.get(element);
   }
 
   @Override
-  public String getAriaRelevantProperty(Element element) {
-    return Property.RELEVANT.get(element);
-  }
-
-  @Override
-  public String getTabindexExtraAttribute(Element element) {
-    return ExtraAttribute.TABINDEX.get(element);
-  }
-
-  @Override
-  public void removeAriaAtomicProperty(Element element) {
-    Property.ATOMIC.remove(element);
-  }
-
-  @Override
-  public void removeAriaBusyState(Element element) {
-    State.BUSY.remove(element);
-  }
-
-  @Override
-  public void removeAriaControlsProperty(Element element) {
-    Property.CONTROLS.remove(element);
-  }
-
-  @Override
-  public void removeAriaDescribedbyProperty(Element element) {
-    Property.DESCRIBEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaDisabledState(Element element) {
-    State.DISABLED.remove(element);
-  }
-
-  @Override
-  public void removeAriaDropeffectProperty(Element element) {
-    Property.DROPEFFECT.remove(element);
-  }
-
-  @Override
   public void removeAriaExpandedState(Element element) {
     State.EXPANDED.remove(element);
   }
 
   @Override
-  public void removeAriaFlowtoProperty(Element element) {
-    Property.FLOWTO.remove(element);
-  }
-
-  @Override
-  public void removeAriaGrabbedState(Element element) {
-    State.GRABBED.remove(element);
-  }
-
-  @Override
-  public void removeAriaHaspopupProperty(Element element) {
-    Property.HASPOPUP.remove(element);
-  }
-
-  @Override
-  public void removeAriaHiddenState(Element element) {
-    State.HIDDEN.remove(element);
-  }
-
-  @Override
-  public void removeAriaInvalidState(Element element) {
-    State.INVALID.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelledbyProperty(Element element) {
-    Property.LABELLEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelProperty(Element element) {
-    Property.LABEL.remove(element);
-  }
-
-  @Override
-  public void removeAriaLiveProperty(Element element) {
-    Property.LIVE.remove(element);
-  }
-
-  @Override
-  public void removeAriaOwnsProperty(Element element) {
-    Property.OWNS.remove(element);
-  }
-
-  @Override
   public void removeAriaPressedState(Element element) {
     State.PRESSED.remove(element);
   }
 
   @Override
-  public void removeAriaRelevantProperty(Element element) {
-    Property.RELEVANT.remove(element);
-  }
-
-  @Override
-  public void removeTabindexExtraAttribute(Element element) {
-    ExtraAttribute.TABINDEX.remove(element);
-  }
-
-  @Override
-  public void setAriaAtomicProperty(Element element, boolean value) {
-    Property.ATOMIC.set(element, value);
-  }
-
-  @Override
-  public void setAriaBusyState(Element element, boolean value) {
-    State.BUSY.set(element, value);
-  }
-
-  @Override
-  public void setAriaControlsProperty(Element element, IdReference... value) {
-    Property.CONTROLS.set(element, value);
-  }
-
-  @Override
-  public void setAriaDescribedbyProperty(Element element, IdReference... value) {
-    Property.DESCRIBEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaDisabledState(Element element, boolean value) {
-    State.DISABLED.set(element, value);
-  }
-
-  @Override
-  public void setAriaDropeffectProperty(Element element, DropeffectValue... value) {
-    Property.DROPEFFECT.set(element, value);
-  }
-
-  @Override
   public void setAriaExpandedState(Element element, ExpandedValue value) {
     State.EXPANDED.set(element, value);
   }
 
   @Override
-  public void setAriaFlowtoProperty(Element element, IdReference... value) {
-    Property.FLOWTO.set(element, value);
-  }
-
-  @Override
-  public void setAriaGrabbedState(Element element, GrabbedValue value) {
-    State.GRABBED.set(element, value);
-  }
-
-  @Override
-  public void setAriaHaspopupProperty(Element element, boolean value) {
-    Property.HASPOPUP.set(element, value);
-  }
-
-  @Override
-  public void setAriaHiddenState(Element element, boolean value) {
-    State.HIDDEN.set(element, value);
-  }
-
-  @Override
-  public void setAriaInvalidState(Element element, InvalidValue value) {
-    State.INVALID.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelledbyProperty(Element element, IdReference... value) {
-    Property.LABELLEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelProperty(Element element, String value) {
-    Property.LABEL.set(element, value);
-  }
-
-  @Override
-  public void setAriaLiveProperty(Element element, LiveValue value) {
-    Property.LIVE.set(element, value);
-  }
-
-  @Override
-  public void setAriaOwnsProperty(Element element, IdReference... value) {
-    Property.OWNS.set(element, value);
-  }
-
-  @Override
   public void setAriaPressedState(Element element, PressedValue value) {
     State.PRESSED.set(element, value);
   }
-
-  @Override
-  public void setAriaRelevantProperty(Element element, RelevantValue... value) {
-    Property.RELEVANT.set(element, value);
-  }
-
-  @Override
-  public void setTabindexExtraAttribute(Element element, int value) {
-    ExtraAttribute.TABINDEX.set(element, value);
-  }
 }
diff --git a/user/src/com/google/gwt/aria/client/CheckboxRoleImpl.java b/user/src/com/google/gwt/aria/client/CheckboxRoleImpl.java
index c06cfde..7c85946 100644
--- a/user/src/com/google/gwt/aria/client/CheckboxRoleImpl.java
+++ b/user/src/com/google/gwt/aria/client/CheckboxRoleImpl.java
@@ -28,272 +28,17 @@
   }
 
   @Override
-  public String getAriaAtomicProperty(Element element) {
-    return Property.ATOMIC.get(element);
-  }
-
-  @Override
-  public String getAriaBusyState(Element element) {
-    return State.BUSY.get(element);
-  }
-
-  @Override
   public String getAriaCheckedState(Element element) {
     return State.CHECKED.get(element);
   }
 
   @Override
-  public String getAriaControlsProperty(Element element) {
-    return Property.CONTROLS.get(element);
-  }
-
-  @Override
-  public String getAriaDescribedbyProperty(Element element) {
-    return Property.DESCRIBEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaDisabledState(Element element) {
-    return State.DISABLED.get(element);
-  }
-
-  @Override
-  public String getAriaDropeffectProperty(Element element) {
-    return Property.DROPEFFECT.get(element);
-  }
-
-  @Override
-  public String getAriaFlowtoProperty(Element element) {
-    return Property.FLOWTO.get(element);
-  }
-
-  @Override
-  public String getAriaGrabbedState(Element element) {
-    return State.GRABBED.get(element);
-  }
-
-  @Override
-  public String getAriaHaspopupProperty(Element element) {
-    return Property.HASPOPUP.get(element);
-  }
-
-  @Override
-  public String getAriaHiddenState(Element element) {
-    return State.HIDDEN.get(element);
-  }
-
-  @Override
-  public String getAriaInvalidState(Element element) {
-    return State.INVALID.get(element);
-  }
-
-  @Override
-  public String getAriaLabelledbyProperty(Element element) {
-    return Property.LABELLEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaLabelProperty(Element element) {
-    return Property.LABEL.get(element);
-  }
-
-  @Override
-  public String getAriaLiveProperty(Element element) {
-    return Property.LIVE.get(element);
-  }
-
-  @Override
-  public String getAriaOwnsProperty(Element element) {
-    return Property.OWNS.get(element);
-  }
-
-  @Override
-  public String getAriaRelevantProperty(Element element) {
-    return Property.RELEVANT.get(element);
-  }
-
-  @Override
-  public String getTabindexExtraAttribute(Element element) {
-    return ExtraAttribute.TABINDEX.get(element);
-  }
-
-  @Override
-  public void removeAriaAtomicProperty(Element element) {
-    Property.ATOMIC.remove(element);
-  }
-
-  @Override
-  public void removeAriaBusyState(Element element) {
-    State.BUSY.remove(element);
-  }
-
-  @Override
   public void removeAriaCheckedState(Element element) {
     State.CHECKED.remove(element);
   }
 
   @Override
-  public void removeAriaControlsProperty(Element element) {
-    Property.CONTROLS.remove(element);
-  }
-
-  @Override
-  public void removeAriaDescribedbyProperty(Element element) {
-    Property.DESCRIBEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaDisabledState(Element element) {
-    State.DISABLED.remove(element);
-  }
-
-  @Override
-  public void removeAriaDropeffectProperty(Element element) {
-    Property.DROPEFFECT.remove(element);
-  }
-
-  @Override
-  public void removeAriaFlowtoProperty(Element element) {
-    Property.FLOWTO.remove(element);
-  }
-
-  @Override
-  public void removeAriaGrabbedState(Element element) {
-    State.GRABBED.remove(element);
-  }
-
-  @Override
-  public void removeAriaHaspopupProperty(Element element) {
-    Property.HASPOPUP.remove(element);
-  }
-
-  @Override
-  public void removeAriaHiddenState(Element element) {
-    State.HIDDEN.remove(element);
-  }
-
-  @Override
-  public void removeAriaInvalidState(Element element) {
-    State.INVALID.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelledbyProperty(Element element) {
-    Property.LABELLEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelProperty(Element element) {
-    Property.LABEL.remove(element);
-  }
-
-  @Override
-  public void removeAriaLiveProperty(Element element) {
-    Property.LIVE.remove(element);
-  }
-
-  @Override
-  public void removeAriaOwnsProperty(Element element) {
-    Property.OWNS.remove(element);
-  }
-
-  @Override
-  public void removeAriaRelevantProperty(Element element) {
-    Property.RELEVANT.remove(element);
-  }
-
-  @Override
-  public void removeTabindexExtraAttribute(Element element) {
-    ExtraAttribute.TABINDEX.remove(element);
-  }
-
-  @Override
-  public void setAriaAtomicProperty(Element element, boolean value) {
-    Property.ATOMIC.set(element, value);
-  }
-
-  @Override
-  public void setAriaBusyState(Element element, boolean value) {
-    State.BUSY.set(element, value);
-  }
-
-  @Override
   public void setAriaCheckedState(Element element, CheckedValue value) {
     State.CHECKED.set(element, value);
   }
-
-  @Override
-  public void setAriaControlsProperty(Element element, IdReference... value) {
-    Property.CONTROLS.set(element, value);
-  }
-
-  @Override
-  public void setAriaDescribedbyProperty(Element element, IdReference... value) {
-    Property.DESCRIBEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaDisabledState(Element element, boolean value) {
-    State.DISABLED.set(element, value);
-  }
-
-  @Override
-  public void setAriaDropeffectProperty(Element element, DropeffectValue... value) {
-    Property.DROPEFFECT.set(element, value);
-  }
-
-  @Override
-  public void setAriaFlowtoProperty(Element element, IdReference... value) {
-    Property.FLOWTO.set(element, value);
-  }
-
-  @Override
-  public void setAriaGrabbedState(Element element, GrabbedValue value) {
-    State.GRABBED.set(element, value);
-  }
-
-  @Override
-  public void setAriaHaspopupProperty(Element element, boolean value) {
-    Property.HASPOPUP.set(element, value);
-  }
-
-  @Override
-  public void setAriaHiddenState(Element element, boolean value) {
-    State.HIDDEN.set(element, value);
-  }
-
-  @Override
-  public void setAriaInvalidState(Element element, InvalidValue value) {
-    State.INVALID.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelledbyProperty(Element element, IdReference... value) {
-    Property.LABELLEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelProperty(Element element, String value) {
-    Property.LABEL.set(element, value);
-  }
-
-  @Override
-  public void setAriaLiveProperty(Element element, LiveValue value) {
-    Property.LIVE.set(element, value);
-  }
-
-  @Override
-  public void setAriaOwnsProperty(Element element, IdReference... value) {
-    Property.OWNS.set(element, value);
-  }
-
-  @Override
-  public void setAriaRelevantProperty(Element element, RelevantValue... value) {
-    Property.RELEVANT.set(element, value);
-  }
-
-  @Override
-  public void setTabindexExtraAttribute(Element element, int value) {
-    ExtraAttribute.TABINDEX.set(element, value);
-  }
 }
diff --git a/user/src/com/google/gwt/aria/client/ColumnheaderRoleImpl.java b/user/src/com/google/gwt/aria/client/ColumnheaderRoleImpl.java
index abc855f..5c89ca7 100644
--- a/user/src/com/google/gwt/aria/client/ColumnheaderRoleImpl.java
+++ b/user/src/com/google/gwt/aria/client/ColumnheaderRoleImpl.java
@@ -28,96 +28,16 @@
   }
 
   @Override
-  public String getAriaAtomicProperty(Element element) {
-    return Property.ATOMIC.get(element);
-  }
-
-  @Override
-  public String getAriaBusyState(Element element) {
-    return State.BUSY.get(element);
-  }
-
-  @Override
-  public String getAriaControlsProperty(Element element) {
-    return Property.CONTROLS.get(element);
-  }
-
-  @Override
-  public String getAriaDescribedbyProperty(Element element) {
-    return Property.DESCRIBEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaDisabledState(Element element) {
-    return State.DISABLED.get(element);
-  }
-
-  @Override
-  public String getAriaDropeffectProperty(Element element) {
-    return Property.DROPEFFECT.get(element);
-  }
-
-  @Override
   public String getAriaExpandedState(Element element) {
     return State.EXPANDED.get(element);
   }
 
   @Override
-  public String getAriaFlowtoProperty(Element element) {
-    return Property.FLOWTO.get(element);
-  }
-
-  @Override
-  public String getAriaGrabbedState(Element element) {
-    return State.GRABBED.get(element);
-  }
-
-  @Override
-  public String getAriaHaspopupProperty(Element element) {
-    return Property.HASPOPUP.get(element);
-  }
-
-  @Override
-  public String getAriaHiddenState(Element element) {
-    return State.HIDDEN.get(element);
-  }
-
-  @Override
-  public String getAriaInvalidState(Element element) {
-    return State.INVALID.get(element);
-  }
-
-  @Override
-  public String getAriaLabelledbyProperty(Element element) {
-    return Property.LABELLEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaLabelProperty(Element element) {
-    return Property.LABEL.get(element);
-  }
-
-  @Override
-  public String getAriaLiveProperty(Element element) {
-    return Property.LIVE.get(element);
-  }
-
-  @Override
-  public String getAriaOwnsProperty(Element element) {
-    return Property.OWNS.get(element);
-  }
-
-  @Override
   public String getAriaReadonlyProperty(Element element) {
     return Property.READONLY.get(element);
   }
 
   @Override
-  public String getAriaRelevantProperty(Element element) {
-    return Property.RELEVANT.get(element);
-  }
-
-  @Override
   public String getAriaRequiredProperty(Element element) {
     return Property.REQUIRED.get(element);
   }
@@ -133,101 +53,16 @@
   }
 
   @Override
-  public String getTabindexExtraAttribute(Element element) {
-    return ExtraAttribute.TABINDEX.get(element);
-  }
-
-  @Override
-  public void removeAriaAtomicProperty(Element element) {
-    Property.ATOMIC.remove(element);
-  }
-
-  @Override
-  public void removeAriaBusyState(Element element) {
-    State.BUSY.remove(element);
-  }
-
-  @Override
-  public void removeAriaControlsProperty(Element element) {
-    Property.CONTROLS.remove(element);
-  }
-
-  @Override
-  public void removeAriaDescribedbyProperty(Element element) {
-    Property.DESCRIBEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaDisabledState(Element element) {
-    State.DISABLED.remove(element);
-  }
-
-  @Override
-  public void removeAriaDropeffectProperty(Element element) {
-    Property.DROPEFFECT.remove(element);
-  }
-
-  @Override
   public void removeAriaExpandedState(Element element) {
     State.EXPANDED.remove(element);
   }
 
   @Override
-  public void removeAriaFlowtoProperty(Element element) {
-    Property.FLOWTO.remove(element);
-  }
-
-  @Override
-  public void removeAriaGrabbedState(Element element) {
-    State.GRABBED.remove(element);
-  }
-
-  @Override
-  public void removeAriaHaspopupProperty(Element element) {
-    Property.HASPOPUP.remove(element);
-  }
-
-  @Override
-  public void removeAriaHiddenState(Element element) {
-    State.HIDDEN.remove(element);
-  }
-
-  @Override
-  public void removeAriaInvalidState(Element element) {
-    State.INVALID.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelledbyProperty(Element element) {
-    Property.LABELLEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelProperty(Element element) {
-    Property.LABEL.remove(element);
-  }
-
-  @Override
-  public void removeAriaLiveProperty(Element element) {
-    Property.LIVE.remove(element);
-  }
-
-  @Override
-  public void removeAriaOwnsProperty(Element element) {
-    Property.OWNS.remove(element);
-  }
-
-  @Override
   public void removeAriaReadonlyProperty(Element element) {
     Property.READONLY.remove(element);
   }
 
   @Override
-  public void removeAriaRelevantProperty(Element element) {
-    Property.RELEVANT.remove(element);
-  }
-
-  @Override
   public void removeAriaRequiredProperty(Element element) {
     Property.REQUIRED.remove(element);
   }
@@ -243,101 +78,16 @@
   }
 
   @Override
-  public void removeTabindexExtraAttribute(Element element) {
-    ExtraAttribute.TABINDEX.remove(element);
-  }
-
-  @Override
-  public void setAriaAtomicProperty(Element element, boolean value) {
-    Property.ATOMIC.set(element, value);
-  }
-
-  @Override
-  public void setAriaBusyState(Element element, boolean value) {
-    State.BUSY.set(element, value);
-  }
-
-  @Override
-  public void setAriaControlsProperty(Element element, IdReference... value) {
-    Property.CONTROLS.set(element, value);
-  }
-
-  @Override
-  public void setAriaDescribedbyProperty(Element element, IdReference... value) {
-    Property.DESCRIBEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaDisabledState(Element element, boolean value) {
-    State.DISABLED.set(element, value);
-  }
-
-  @Override
-  public void setAriaDropeffectProperty(Element element, DropeffectValue... value) {
-    Property.DROPEFFECT.set(element, value);
-  }
-
-  @Override
   public void setAriaExpandedState(Element element, ExpandedValue value) {
     State.EXPANDED.set(element, value);
   }
 
   @Override
-  public void setAriaFlowtoProperty(Element element, IdReference... value) {
-    Property.FLOWTO.set(element, value);
-  }
-
-  @Override
-  public void setAriaGrabbedState(Element element, GrabbedValue value) {
-    State.GRABBED.set(element, value);
-  }
-
-  @Override
-  public void setAriaHaspopupProperty(Element element, boolean value) {
-    Property.HASPOPUP.set(element, value);
-  }
-
-  @Override
-  public void setAriaHiddenState(Element element, boolean value) {
-    State.HIDDEN.set(element, value);
-  }
-
-  @Override
-  public void setAriaInvalidState(Element element, InvalidValue value) {
-    State.INVALID.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelledbyProperty(Element element, IdReference... value) {
-    Property.LABELLEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelProperty(Element element, String value) {
-    Property.LABEL.set(element, value);
-  }
-
-  @Override
-  public void setAriaLiveProperty(Element element, LiveValue value) {
-    Property.LIVE.set(element, value);
-  }
-
-  @Override
-  public void setAriaOwnsProperty(Element element, IdReference... value) {
-    Property.OWNS.set(element, value);
-  }
-
-  @Override
   public void setAriaReadonlyProperty(Element element, boolean value) {
     Property.READONLY.set(element, value);
   }
 
   @Override
-  public void setAriaRelevantProperty(Element element, RelevantValue... value) {
-    Property.RELEVANT.set(element, value);
-  }
-
-  @Override
   public void setAriaRequiredProperty(Element element, boolean value) {
     Property.REQUIRED.set(element, value);
   }
@@ -351,9 +101,4 @@
   public void setAriaSortProperty(Element element, SortValue value) {
     Property.SORT.set(element, value);
   }
-
-  @Override
-  public void setTabindexExtraAttribute(Element element, int value) {
-    ExtraAttribute.TABINDEX.set(element, value);
-  }
 }
diff --git a/user/src/com/google/gwt/aria/client/ComboboxRoleImpl.java b/user/src/com/google/gwt/aria/client/ComboboxRoleImpl.java
index 8e068de..b1e61da 100644
--- a/user/src/com/google/gwt/aria/client/ComboboxRoleImpl.java
+++ b/user/src/com/google/gwt/aria/client/ComboboxRoleImpl.java
@@ -33,312 +33,57 @@
   }
 
   @Override
-  public String getAriaAtomicProperty(Element element) {
-    return Property.ATOMIC.get(element);
-  }
-
-  @Override
   public String getAriaAutocompleteProperty(Element element) {
     return Property.AUTOCOMPLETE.get(element);
   }
 
   @Override
-  public String getAriaBusyState(Element element) {
-    return State.BUSY.get(element);
-  }
-
-  @Override
-  public String getAriaControlsProperty(Element element) {
-    return Property.CONTROLS.get(element);
-  }
-
-  @Override
-  public String getAriaDescribedbyProperty(Element element) {
-    return Property.DESCRIBEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaDisabledState(Element element) {
-    return State.DISABLED.get(element);
-  }
-
-  @Override
-  public String getAriaDropeffectProperty(Element element) {
-    return Property.DROPEFFECT.get(element);
-  }
-
-  @Override
   public String getAriaExpandedState(Element element) {
     return State.EXPANDED.get(element);
   }
 
   @Override
-  public String getAriaFlowtoProperty(Element element) {
-    return Property.FLOWTO.get(element);
-  }
-
-  @Override
-  public String getAriaGrabbedState(Element element) {
-    return State.GRABBED.get(element);
-  }
-
-  @Override
-  public String getAriaHaspopupProperty(Element element) {
-    return Property.HASPOPUP.get(element);
-  }
-
-  @Override
-  public String getAriaHiddenState(Element element) {
-    return State.HIDDEN.get(element);
-  }
-
-  @Override
-  public String getAriaInvalidState(Element element) {
-    return State.INVALID.get(element);
-  }
-
-  @Override
-  public String getAriaLabelledbyProperty(Element element) {
-    return Property.LABELLEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaLabelProperty(Element element) {
-    return Property.LABEL.get(element);
-  }
-
-  @Override
-  public String getAriaLiveProperty(Element element) {
-    return Property.LIVE.get(element);
-  }
-
-  @Override
-  public String getAriaOwnsProperty(Element element) {
-    return Property.OWNS.get(element);
-  }
-
-  @Override
-  public String getAriaRelevantProperty(Element element) {
-    return Property.RELEVANT.get(element);
-  }
-
-  @Override
   public String getAriaRequiredProperty(Element element) {
     return Property.REQUIRED.get(element);
   }
 
   @Override
-  public String getTabindexExtraAttribute(Element element) {
-    return ExtraAttribute.TABINDEX.get(element);
-  }
-
-  @Override
   public void removeAriaActivedescendantProperty(Element element) {
     Property.ACTIVEDESCENDANT.remove(element);
   }
 
   @Override
-  public void removeAriaAtomicProperty(Element element) {
-    Property.ATOMIC.remove(element);
-  }
-
-  @Override
   public void removeAriaAutocompleteProperty(Element element) {
     Property.AUTOCOMPLETE.remove(element);
   }
 
   @Override
-  public void removeAriaBusyState(Element element) {
-    State.BUSY.remove(element);
-  }
-
-  @Override
-  public void removeAriaControlsProperty(Element element) {
-    Property.CONTROLS.remove(element);
-  }
-
-  @Override
-  public void removeAriaDescribedbyProperty(Element element) {
-    Property.DESCRIBEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaDisabledState(Element element) {
-    State.DISABLED.remove(element);
-  }
-
-  @Override
-  public void removeAriaDropeffectProperty(Element element) {
-    Property.DROPEFFECT.remove(element);
-  }
-
-  @Override
   public void removeAriaExpandedState(Element element) {
     State.EXPANDED.remove(element);
   }
 
   @Override
-  public void removeAriaFlowtoProperty(Element element) {
-    Property.FLOWTO.remove(element);
-  }
-
-  @Override
-  public void removeAriaGrabbedState(Element element) {
-    State.GRABBED.remove(element);
-  }
-
-  @Override
-  public void removeAriaHaspopupProperty(Element element) {
-    Property.HASPOPUP.remove(element);
-  }
-
-  @Override
-  public void removeAriaHiddenState(Element element) {
-    State.HIDDEN.remove(element);
-  }
-
-  @Override
-  public void removeAriaInvalidState(Element element) {
-    State.INVALID.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelledbyProperty(Element element) {
-    Property.LABELLEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelProperty(Element element) {
-    Property.LABEL.remove(element);
-  }
-
-  @Override
-  public void removeAriaLiveProperty(Element element) {
-    Property.LIVE.remove(element);
-  }
-
-  @Override
-  public void removeAriaOwnsProperty(Element element) {
-    Property.OWNS.remove(element);
-  }
-
-  @Override
-  public void removeAriaRelevantProperty(Element element) {
-    Property.RELEVANT.remove(element);
-  }
-
-  @Override
   public void removeAriaRequiredProperty(Element element) {
     Property.REQUIRED.remove(element);
   }
 
   @Override
-  public void removeTabindexExtraAttribute(Element element) {
-    ExtraAttribute.TABINDEX.remove(element);
-  }
-
-  @Override
   public void setAriaActivedescendantProperty(Element element, IdReference value) {
     Property.ACTIVEDESCENDANT.set(element, value);
   }
 
   @Override
-  public void setAriaAtomicProperty(Element element, boolean value) {
-    Property.ATOMIC.set(element, value);
-  }
-
-  @Override
   public void setAriaAutocompleteProperty(Element element, AutocompleteValue value) {
     Property.AUTOCOMPLETE.set(element, value);
   }
 
   @Override
-  public void setAriaBusyState(Element element, boolean value) {
-    State.BUSY.set(element, value);
-  }
-
-  @Override
-  public void setAriaControlsProperty(Element element, IdReference... value) {
-    Property.CONTROLS.set(element, value);
-  }
-
-  @Override
-  public void setAriaDescribedbyProperty(Element element, IdReference... value) {
-    Property.DESCRIBEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaDisabledState(Element element, boolean value) {
-    State.DISABLED.set(element, value);
-  }
-
-  @Override
-  public void setAriaDropeffectProperty(Element element, DropeffectValue... value) {
-    Property.DROPEFFECT.set(element, value);
-  }
-
-  @Override
   public void setAriaExpandedState(Element element, ExpandedValue value) {
     State.EXPANDED.set(element, value);
   }
 
   @Override
-  public void setAriaFlowtoProperty(Element element, IdReference... value) {
-    Property.FLOWTO.set(element, value);
-  }
-
-  @Override
-  public void setAriaGrabbedState(Element element, GrabbedValue value) {
-    State.GRABBED.set(element, value);
-  }
-
-  @Override
-  public void setAriaHaspopupProperty(Element element, boolean value) {
-    Property.HASPOPUP.set(element, value);
-  }
-
-  @Override
-  public void setAriaHiddenState(Element element, boolean value) {
-    State.HIDDEN.set(element, value);
-  }
-
-  @Override
-  public void setAriaInvalidState(Element element, InvalidValue value) {
-    State.INVALID.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelledbyProperty(Element element, IdReference... value) {
-    Property.LABELLEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelProperty(Element element, String value) {
-    Property.LABEL.set(element, value);
-  }
-
-  @Override
-  public void setAriaLiveProperty(Element element, LiveValue value) {
-    Property.LIVE.set(element, value);
-  }
-
-  @Override
-  public void setAriaOwnsProperty(Element element, IdReference... value) {
-    Property.OWNS.set(element, value);
-  }
-
-  @Override
-  public void setAriaRelevantProperty(Element element, RelevantValue... value) {
-    Property.RELEVANT.set(element, value);
-  }
-
-  @Override
   public void setAriaRequiredProperty(Element element, boolean value) {
     Property.REQUIRED.set(element, value);
   }
-
-  @Override
-  public void setTabindexExtraAttribute(Element element, int value) {
-    ExtraAttribute.TABINDEX.set(element, value);
-  }
 }
diff --git a/user/src/com/google/gwt/aria/client/CommandRole.java b/user/src/com/google/gwt/aria/client/CommandRole.java
index 0b19a4f..2cbd126 100644
--- a/user/src/com/google/gwt/aria/client/CommandRole.java
+++ b/user/src/com/google/gwt/aria/client/CommandRole.java
@@ -17,7 +17,6 @@
 // This is auto-generated code.  Do not manually edit! //
 /////////////////////////////////////////////////////////
 
-
 /**
  * A type that represents the <a href="http://www.w3.org/TR/wai-aria/roles#command">command</a>
  * role in the ARIA specification.
diff --git a/user/src/com/google/gwt/aria/client/ComplementaryRole.java b/user/src/com/google/gwt/aria/client/ComplementaryRole.java
index cbde080..6aa693a 100644
--- a/user/src/com/google/gwt/aria/client/ComplementaryRole.java
+++ b/user/src/com/google/gwt/aria/client/ComplementaryRole.java
@@ -17,7 +17,6 @@
 // This is auto-generated code.  Do not manually edit! //
 /////////////////////////////////////////////////////////
 
-
 /**
  * A type that represents the <a href="http://www.w3.org/TR/wai-aria/roles#complementary">complementary</a>
  * role in the ARIA specification.
diff --git a/user/src/com/google/gwt/aria/client/ComplementaryRoleImpl.java b/user/src/com/google/gwt/aria/client/ComplementaryRoleImpl.java
index 45eedd2..40a8e48 100644
--- a/user/src/com/google/gwt/aria/client/ComplementaryRoleImpl.java
+++ b/user/src/com/google/gwt/aria/client/ComplementaryRoleImpl.java
@@ -28,272 +28,17 @@
   }
 
   @Override
-  public String getAriaAtomicProperty(Element element) {
-    return Property.ATOMIC.get(element);
-  }
-
-  @Override
-  public String getAriaBusyState(Element element) {
-    return State.BUSY.get(element);
-  }
-
-  @Override
-  public String getAriaControlsProperty(Element element) {
-    return Property.CONTROLS.get(element);
-  }
-
-  @Override
-  public String getAriaDescribedbyProperty(Element element) {
-    return Property.DESCRIBEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaDisabledState(Element element) {
-    return State.DISABLED.get(element);
-  }
-
-  @Override
-  public String getAriaDropeffectProperty(Element element) {
-    return Property.DROPEFFECT.get(element);
-  }
-
-  @Override
   public String getAriaExpandedState(Element element) {
     return State.EXPANDED.get(element);
   }
 
   @Override
-  public String getAriaFlowtoProperty(Element element) {
-    return Property.FLOWTO.get(element);
-  }
-
-  @Override
-  public String getAriaGrabbedState(Element element) {
-    return State.GRABBED.get(element);
-  }
-
-  @Override
-  public String getAriaHaspopupProperty(Element element) {
-    return Property.HASPOPUP.get(element);
-  }
-
-  @Override
-  public String getAriaHiddenState(Element element) {
-    return State.HIDDEN.get(element);
-  }
-
-  @Override
-  public String getAriaInvalidState(Element element) {
-    return State.INVALID.get(element);
-  }
-
-  @Override
-  public String getAriaLabelledbyProperty(Element element) {
-    return Property.LABELLEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaLabelProperty(Element element) {
-    return Property.LABEL.get(element);
-  }
-
-  @Override
-  public String getAriaLiveProperty(Element element) {
-    return Property.LIVE.get(element);
-  }
-
-  @Override
-  public String getAriaOwnsProperty(Element element) {
-    return Property.OWNS.get(element);
-  }
-
-  @Override
-  public String getAriaRelevantProperty(Element element) {
-    return Property.RELEVANT.get(element);
-  }
-
-  @Override
-  public String getTabindexExtraAttribute(Element element) {
-    return ExtraAttribute.TABINDEX.get(element);
-  }
-
-  @Override
-  public void removeAriaAtomicProperty(Element element) {
-    Property.ATOMIC.remove(element);
-  }
-
-  @Override
-  public void removeAriaBusyState(Element element) {
-    State.BUSY.remove(element);
-  }
-
-  @Override
-  public void removeAriaControlsProperty(Element element) {
-    Property.CONTROLS.remove(element);
-  }
-
-  @Override
-  public void removeAriaDescribedbyProperty(Element element) {
-    Property.DESCRIBEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaDisabledState(Element element) {
-    State.DISABLED.remove(element);
-  }
-
-  @Override
-  public void removeAriaDropeffectProperty(Element element) {
-    Property.DROPEFFECT.remove(element);
-  }
-
-  @Override
   public void removeAriaExpandedState(Element element) {
     State.EXPANDED.remove(element);
   }
 
   @Override
-  public void removeAriaFlowtoProperty(Element element) {
-    Property.FLOWTO.remove(element);
-  }
-
-  @Override
-  public void removeAriaGrabbedState(Element element) {
-    State.GRABBED.remove(element);
-  }
-
-  @Override
-  public void removeAriaHaspopupProperty(Element element) {
-    Property.HASPOPUP.remove(element);
-  }
-
-  @Override
-  public void removeAriaHiddenState(Element element) {
-    State.HIDDEN.remove(element);
-  }
-
-  @Override
-  public void removeAriaInvalidState(Element element) {
-    State.INVALID.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelledbyProperty(Element element) {
-    Property.LABELLEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelProperty(Element element) {
-    Property.LABEL.remove(element);
-  }
-
-  @Override
-  public void removeAriaLiveProperty(Element element) {
-    Property.LIVE.remove(element);
-  }
-
-  @Override
-  public void removeAriaOwnsProperty(Element element) {
-    Property.OWNS.remove(element);
-  }
-
-  @Override
-  public void removeAriaRelevantProperty(Element element) {
-    Property.RELEVANT.remove(element);
-  }
-
-  @Override
-  public void removeTabindexExtraAttribute(Element element) {
-    ExtraAttribute.TABINDEX.remove(element);
-  }
-
-  @Override
-  public void setAriaAtomicProperty(Element element, boolean value) {
-    Property.ATOMIC.set(element, value);
-  }
-
-  @Override
-  public void setAriaBusyState(Element element, boolean value) {
-    State.BUSY.set(element, value);
-  }
-
-  @Override
-  public void setAriaControlsProperty(Element element, IdReference... value) {
-    Property.CONTROLS.set(element, value);
-  }
-
-  @Override
-  public void setAriaDescribedbyProperty(Element element, IdReference... value) {
-    Property.DESCRIBEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaDisabledState(Element element, boolean value) {
-    State.DISABLED.set(element, value);
-  }
-
-  @Override
-  public void setAriaDropeffectProperty(Element element, DropeffectValue... value) {
-    Property.DROPEFFECT.set(element, value);
-  }
-
-  @Override
   public void setAriaExpandedState(Element element, ExpandedValue value) {
     State.EXPANDED.set(element, value);
   }
-
-  @Override
-  public void setAriaFlowtoProperty(Element element, IdReference... value) {
-    Property.FLOWTO.set(element, value);
-  }
-
-  @Override
-  public void setAriaGrabbedState(Element element, GrabbedValue value) {
-    State.GRABBED.set(element, value);
-  }
-
-  @Override
-  public void setAriaHaspopupProperty(Element element, boolean value) {
-    Property.HASPOPUP.set(element, value);
-  }
-
-  @Override
-  public void setAriaHiddenState(Element element, boolean value) {
-    State.HIDDEN.set(element, value);
-  }
-
-  @Override
-  public void setAriaInvalidState(Element element, InvalidValue value) {
-    State.INVALID.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelledbyProperty(Element element, IdReference... value) {
-    Property.LABELLEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelProperty(Element element, String value) {
-    Property.LABEL.set(element, value);
-  }
-
-  @Override
-  public void setAriaLiveProperty(Element element, LiveValue value) {
-    Property.LIVE.set(element, value);
-  }
-
-  @Override
-  public void setAriaOwnsProperty(Element element, IdReference... value) {
-    Property.OWNS.set(element, value);
-  }
-
-  @Override
-  public void setAriaRelevantProperty(Element element, RelevantValue... value) {
-    Property.RELEVANT.set(element, value);
-  }
-
-  @Override
-  public void setTabindexExtraAttribute(Element element, int value) {
-    ExtraAttribute.TABINDEX.set(element, value);
-  }
 }
diff --git a/user/src/com/google/gwt/aria/client/ContentinfoRole.java b/user/src/com/google/gwt/aria/client/ContentinfoRole.java
index bef7d5d..a6ce3e5 100644
--- a/user/src/com/google/gwt/aria/client/ContentinfoRole.java
+++ b/user/src/com/google/gwt/aria/client/ContentinfoRole.java
@@ -17,7 +17,6 @@
 // This is auto-generated code.  Do not manually edit! //
 /////////////////////////////////////////////////////////
 
-
 /**
  * A type that represents the <a href="http://www.w3.org/TR/wai-aria/roles#contentinfo">contentinfo</a>
  * role in the ARIA specification.
diff --git a/user/src/com/google/gwt/aria/client/ContentinfoRoleImpl.java b/user/src/com/google/gwt/aria/client/ContentinfoRoleImpl.java
index a5db746..6e205c9 100644
--- a/user/src/com/google/gwt/aria/client/ContentinfoRoleImpl.java
+++ b/user/src/com/google/gwt/aria/client/ContentinfoRoleImpl.java
@@ -28,272 +28,17 @@
   }
 
   @Override
-  public String getAriaAtomicProperty(Element element) {
-    return Property.ATOMIC.get(element);
-  }
-
-  @Override
-  public String getAriaBusyState(Element element) {
-    return State.BUSY.get(element);
-  }
-
-  @Override
-  public String getAriaControlsProperty(Element element) {
-    return Property.CONTROLS.get(element);
-  }
-
-  @Override
-  public String getAriaDescribedbyProperty(Element element) {
-    return Property.DESCRIBEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaDisabledState(Element element) {
-    return State.DISABLED.get(element);
-  }
-
-  @Override
-  public String getAriaDropeffectProperty(Element element) {
-    return Property.DROPEFFECT.get(element);
-  }
-
-  @Override
   public String getAriaExpandedState(Element element) {
     return State.EXPANDED.get(element);
   }
 
   @Override
-  public String getAriaFlowtoProperty(Element element) {
-    return Property.FLOWTO.get(element);
-  }
-
-  @Override
-  public String getAriaGrabbedState(Element element) {
-    return State.GRABBED.get(element);
-  }
-
-  @Override
-  public String getAriaHaspopupProperty(Element element) {
-    return Property.HASPOPUP.get(element);
-  }
-
-  @Override
-  public String getAriaHiddenState(Element element) {
-    return State.HIDDEN.get(element);
-  }
-
-  @Override
-  public String getAriaInvalidState(Element element) {
-    return State.INVALID.get(element);
-  }
-
-  @Override
-  public String getAriaLabelledbyProperty(Element element) {
-    return Property.LABELLEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaLabelProperty(Element element) {
-    return Property.LABEL.get(element);
-  }
-
-  @Override
-  public String getAriaLiveProperty(Element element) {
-    return Property.LIVE.get(element);
-  }
-
-  @Override
-  public String getAriaOwnsProperty(Element element) {
-    return Property.OWNS.get(element);
-  }
-
-  @Override
-  public String getAriaRelevantProperty(Element element) {
-    return Property.RELEVANT.get(element);
-  }
-
-  @Override
-  public String getTabindexExtraAttribute(Element element) {
-    return ExtraAttribute.TABINDEX.get(element);
-  }
-
-  @Override
-  public void removeAriaAtomicProperty(Element element) {
-    Property.ATOMIC.remove(element);
-  }
-
-  @Override
-  public void removeAriaBusyState(Element element) {
-    State.BUSY.remove(element);
-  }
-
-  @Override
-  public void removeAriaControlsProperty(Element element) {
-    Property.CONTROLS.remove(element);
-  }
-
-  @Override
-  public void removeAriaDescribedbyProperty(Element element) {
-    Property.DESCRIBEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaDisabledState(Element element) {
-    State.DISABLED.remove(element);
-  }
-
-  @Override
-  public void removeAriaDropeffectProperty(Element element) {
-    Property.DROPEFFECT.remove(element);
-  }
-
-  @Override
   public void removeAriaExpandedState(Element element) {
     State.EXPANDED.remove(element);
   }
 
   @Override
-  public void removeAriaFlowtoProperty(Element element) {
-    Property.FLOWTO.remove(element);
-  }
-
-  @Override
-  public void removeAriaGrabbedState(Element element) {
-    State.GRABBED.remove(element);
-  }
-
-  @Override
-  public void removeAriaHaspopupProperty(Element element) {
-    Property.HASPOPUP.remove(element);
-  }
-
-  @Override
-  public void removeAriaHiddenState(Element element) {
-    State.HIDDEN.remove(element);
-  }
-
-  @Override
-  public void removeAriaInvalidState(Element element) {
-    State.INVALID.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelledbyProperty(Element element) {
-    Property.LABELLEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelProperty(Element element) {
-    Property.LABEL.remove(element);
-  }
-
-  @Override
-  public void removeAriaLiveProperty(Element element) {
-    Property.LIVE.remove(element);
-  }
-
-  @Override
-  public void removeAriaOwnsProperty(Element element) {
-    Property.OWNS.remove(element);
-  }
-
-  @Override
-  public void removeAriaRelevantProperty(Element element) {
-    Property.RELEVANT.remove(element);
-  }
-
-  @Override
-  public void removeTabindexExtraAttribute(Element element) {
-    ExtraAttribute.TABINDEX.remove(element);
-  }
-
-  @Override
-  public void setAriaAtomicProperty(Element element, boolean value) {
-    Property.ATOMIC.set(element, value);
-  }
-
-  @Override
-  public void setAriaBusyState(Element element, boolean value) {
-    State.BUSY.set(element, value);
-  }
-
-  @Override
-  public void setAriaControlsProperty(Element element, IdReference... value) {
-    Property.CONTROLS.set(element, value);
-  }
-
-  @Override
-  public void setAriaDescribedbyProperty(Element element, IdReference... value) {
-    Property.DESCRIBEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaDisabledState(Element element, boolean value) {
-    State.DISABLED.set(element, value);
-  }
-
-  @Override
-  public void setAriaDropeffectProperty(Element element, DropeffectValue... value) {
-    Property.DROPEFFECT.set(element, value);
-  }
-
-  @Override
   public void setAriaExpandedState(Element element, ExpandedValue value) {
     State.EXPANDED.set(element, value);
   }
-
-  @Override
-  public void setAriaFlowtoProperty(Element element, IdReference... value) {
-    Property.FLOWTO.set(element, value);
-  }
-
-  @Override
-  public void setAriaGrabbedState(Element element, GrabbedValue value) {
-    State.GRABBED.set(element, value);
-  }
-
-  @Override
-  public void setAriaHaspopupProperty(Element element, boolean value) {
-    Property.HASPOPUP.set(element, value);
-  }
-
-  @Override
-  public void setAriaHiddenState(Element element, boolean value) {
-    State.HIDDEN.set(element, value);
-  }
-
-  @Override
-  public void setAriaInvalidState(Element element, InvalidValue value) {
-    State.INVALID.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelledbyProperty(Element element, IdReference... value) {
-    Property.LABELLEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelProperty(Element element, String value) {
-    Property.LABEL.set(element, value);
-  }
-
-  @Override
-  public void setAriaLiveProperty(Element element, LiveValue value) {
-    Property.LIVE.set(element, value);
-  }
-
-  @Override
-  public void setAriaOwnsProperty(Element element, IdReference... value) {
-    Property.OWNS.set(element, value);
-  }
-
-  @Override
-  public void setAriaRelevantProperty(Element element, RelevantValue... value) {
-    Property.RELEVANT.set(element, value);
-  }
-
-  @Override
-  public void setTabindexExtraAttribute(Element element, int value) {
-    ExtraAttribute.TABINDEX.set(element, value);
-  }
 }
diff --git a/user/src/com/google/gwt/aria/client/DefinitionRole.java b/user/src/com/google/gwt/aria/client/DefinitionRole.java
index 3d5e291..62a30de 100644
--- a/user/src/com/google/gwt/aria/client/DefinitionRole.java
+++ b/user/src/com/google/gwt/aria/client/DefinitionRole.java
@@ -17,7 +17,6 @@
 // This is auto-generated code.  Do not manually edit! //
 /////////////////////////////////////////////////////////
 
-
 /**
  * A type that represents the <a href="http://www.w3.org/TR/wai-aria/roles#definition">definition</a>
  * role in the ARIA specification.
diff --git a/user/src/com/google/gwt/aria/client/DefinitionRoleImpl.java b/user/src/com/google/gwt/aria/client/DefinitionRoleImpl.java
index e919610..e81b224 100644
--- a/user/src/com/google/gwt/aria/client/DefinitionRoleImpl.java
+++ b/user/src/com/google/gwt/aria/client/DefinitionRoleImpl.java
@@ -28,272 +28,17 @@
   }
 
   @Override
-  public String getAriaAtomicProperty(Element element) {
-    return Property.ATOMIC.get(element);
-  }
-
-  @Override
-  public String getAriaBusyState(Element element) {
-    return State.BUSY.get(element);
-  }
-
-  @Override
-  public String getAriaControlsProperty(Element element) {
-    return Property.CONTROLS.get(element);
-  }
-
-  @Override
-  public String getAriaDescribedbyProperty(Element element) {
-    return Property.DESCRIBEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaDisabledState(Element element) {
-    return State.DISABLED.get(element);
-  }
-
-  @Override
-  public String getAriaDropeffectProperty(Element element) {
-    return Property.DROPEFFECT.get(element);
-  }
-
-  @Override
   public String getAriaExpandedState(Element element) {
     return State.EXPANDED.get(element);
   }
 
   @Override
-  public String getAriaFlowtoProperty(Element element) {
-    return Property.FLOWTO.get(element);
-  }
-
-  @Override
-  public String getAriaGrabbedState(Element element) {
-    return State.GRABBED.get(element);
-  }
-
-  @Override
-  public String getAriaHaspopupProperty(Element element) {
-    return Property.HASPOPUP.get(element);
-  }
-
-  @Override
-  public String getAriaHiddenState(Element element) {
-    return State.HIDDEN.get(element);
-  }
-
-  @Override
-  public String getAriaInvalidState(Element element) {
-    return State.INVALID.get(element);
-  }
-
-  @Override
-  public String getAriaLabelledbyProperty(Element element) {
-    return Property.LABELLEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaLabelProperty(Element element) {
-    return Property.LABEL.get(element);
-  }
-
-  @Override
-  public String getAriaLiveProperty(Element element) {
-    return Property.LIVE.get(element);
-  }
-
-  @Override
-  public String getAriaOwnsProperty(Element element) {
-    return Property.OWNS.get(element);
-  }
-
-  @Override
-  public String getAriaRelevantProperty(Element element) {
-    return Property.RELEVANT.get(element);
-  }
-
-  @Override
-  public String getTabindexExtraAttribute(Element element) {
-    return ExtraAttribute.TABINDEX.get(element);
-  }
-
-  @Override
-  public void removeAriaAtomicProperty(Element element) {
-    Property.ATOMIC.remove(element);
-  }
-
-  @Override
-  public void removeAriaBusyState(Element element) {
-    State.BUSY.remove(element);
-  }
-
-  @Override
-  public void removeAriaControlsProperty(Element element) {
-    Property.CONTROLS.remove(element);
-  }
-
-  @Override
-  public void removeAriaDescribedbyProperty(Element element) {
-    Property.DESCRIBEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaDisabledState(Element element) {
-    State.DISABLED.remove(element);
-  }
-
-  @Override
-  public void removeAriaDropeffectProperty(Element element) {
-    Property.DROPEFFECT.remove(element);
-  }
-
-  @Override
   public void removeAriaExpandedState(Element element) {
     State.EXPANDED.remove(element);
   }
 
   @Override
-  public void removeAriaFlowtoProperty(Element element) {
-    Property.FLOWTO.remove(element);
-  }
-
-  @Override
-  public void removeAriaGrabbedState(Element element) {
-    State.GRABBED.remove(element);
-  }
-
-  @Override
-  public void removeAriaHaspopupProperty(Element element) {
-    Property.HASPOPUP.remove(element);
-  }
-
-  @Override
-  public void removeAriaHiddenState(Element element) {
-    State.HIDDEN.remove(element);
-  }
-
-  @Override
-  public void removeAriaInvalidState(Element element) {
-    State.INVALID.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelledbyProperty(Element element) {
-    Property.LABELLEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelProperty(Element element) {
-    Property.LABEL.remove(element);
-  }
-
-  @Override
-  public void removeAriaLiveProperty(Element element) {
-    Property.LIVE.remove(element);
-  }
-
-  @Override
-  public void removeAriaOwnsProperty(Element element) {
-    Property.OWNS.remove(element);
-  }
-
-  @Override
-  public void removeAriaRelevantProperty(Element element) {
-    Property.RELEVANT.remove(element);
-  }
-
-  @Override
-  public void removeTabindexExtraAttribute(Element element) {
-    ExtraAttribute.TABINDEX.remove(element);
-  }
-
-  @Override
-  public void setAriaAtomicProperty(Element element, boolean value) {
-    Property.ATOMIC.set(element, value);
-  }
-
-  @Override
-  public void setAriaBusyState(Element element, boolean value) {
-    State.BUSY.set(element, value);
-  }
-
-  @Override
-  public void setAriaControlsProperty(Element element, IdReference... value) {
-    Property.CONTROLS.set(element, value);
-  }
-
-  @Override
-  public void setAriaDescribedbyProperty(Element element, IdReference... value) {
-    Property.DESCRIBEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaDisabledState(Element element, boolean value) {
-    State.DISABLED.set(element, value);
-  }
-
-  @Override
-  public void setAriaDropeffectProperty(Element element, DropeffectValue... value) {
-    Property.DROPEFFECT.set(element, value);
-  }
-
-  @Override
   public void setAriaExpandedState(Element element, ExpandedValue value) {
     State.EXPANDED.set(element, value);
   }
-
-  @Override
-  public void setAriaFlowtoProperty(Element element, IdReference... value) {
-    Property.FLOWTO.set(element, value);
-  }
-
-  @Override
-  public void setAriaGrabbedState(Element element, GrabbedValue value) {
-    State.GRABBED.set(element, value);
-  }
-
-  @Override
-  public void setAriaHaspopupProperty(Element element, boolean value) {
-    Property.HASPOPUP.set(element, value);
-  }
-
-  @Override
-  public void setAriaHiddenState(Element element, boolean value) {
-    State.HIDDEN.set(element, value);
-  }
-
-  @Override
-  public void setAriaInvalidState(Element element, InvalidValue value) {
-    State.INVALID.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelledbyProperty(Element element, IdReference... value) {
-    Property.LABELLEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelProperty(Element element, String value) {
-    Property.LABEL.set(element, value);
-  }
-
-  @Override
-  public void setAriaLiveProperty(Element element, LiveValue value) {
-    Property.LIVE.set(element, value);
-  }
-
-  @Override
-  public void setAriaOwnsProperty(Element element, IdReference... value) {
-    Property.OWNS.set(element, value);
-  }
-
-  @Override
-  public void setAriaRelevantProperty(Element element, RelevantValue... value) {
-    Property.RELEVANT.set(element, value);
-  }
-
-  @Override
-  public void setTabindexExtraAttribute(Element element, int value) {
-    ExtraAttribute.TABINDEX.set(element, value);
-  }
 }
diff --git a/user/src/com/google/gwt/aria/client/DialogRole.java b/user/src/com/google/gwt/aria/client/DialogRole.java
index 6d474b6..1db9491 100644
--- a/user/src/com/google/gwt/aria/client/DialogRole.java
+++ b/user/src/com/google/gwt/aria/client/DialogRole.java
@@ -17,7 +17,6 @@
 // This is auto-generated code.  Do not manually edit! //
 /////////////////////////////////////////////////////////
 
-
 /**
  * A type that represents the <a href="http://www.w3.org/TR/wai-aria/roles#dialog">dialog</a>
  * role in the ARIA specification.
diff --git a/user/src/com/google/gwt/aria/client/DialogRoleImpl.java b/user/src/com/google/gwt/aria/client/DialogRoleImpl.java
index 7b33c00..fd37bda 100644
--- a/user/src/com/google/gwt/aria/client/DialogRoleImpl.java
+++ b/user/src/com/google/gwt/aria/client/DialogRoleImpl.java
@@ -28,272 +28,17 @@
   }
 
   @Override
-  public String getAriaAtomicProperty(Element element) {
-    return Property.ATOMIC.get(element);
-  }
-
-  @Override
-  public String getAriaBusyState(Element element) {
-    return State.BUSY.get(element);
-  }
-
-  @Override
-  public String getAriaControlsProperty(Element element) {
-    return Property.CONTROLS.get(element);
-  }
-
-  @Override
-  public String getAriaDescribedbyProperty(Element element) {
-    return Property.DESCRIBEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaDisabledState(Element element) {
-    return State.DISABLED.get(element);
-  }
-
-  @Override
-  public String getAriaDropeffectProperty(Element element) {
-    return Property.DROPEFFECT.get(element);
-  }
-
-  @Override
   public String getAriaExpandedState(Element element) {
     return State.EXPANDED.get(element);
   }
 
   @Override
-  public String getAriaFlowtoProperty(Element element) {
-    return Property.FLOWTO.get(element);
-  }
-
-  @Override
-  public String getAriaGrabbedState(Element element) {
-    return State.GRABBED.get(element);
-  }
-
-  @Override
-  public String getAriaHaspopupProperty(Element element) {
-    return Property.HASPOPUP.get(element);
-  }
-
-  @Override
-  public String getAriaHiddenState(Element element) {
-    return State.HIDDEN.get(element);
-  }
-
-  @Override
-  public String getAriaInvalidState(Element element) {
-    return State.INVALID.get(element);
-  }
-
-  @Override
-  public String getAriaLabelledbyProperty(Element element) {
-    return Property.LABELLEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaLabelProperty(Element element) {
-    return Property.LABEL.get(element);
-  }
-
-  @Override
-  public String getAriaLiveProperty(Element element) {
-    return Property.LIVE.get(element);
-  }
-
-  @Override
-  public String getAriaOwnsProperty(Element element) {
-    return Property.OWNS.get(element);
-  }
-
-  @Override
-  public String getAriaRelevantProperty(Element element) {
-    return Property.RELEVANT.get(element);
-  }
-
-  @Override
-  public String getTabindexExtraAttribute(Element element) {
-    return ExtraAttribute.TABINDEX.get(element);
-  }
-
-  @Override
-  public void removeAriaAtomicProperty(Element element) {
-    Property.ATOMIC.remove(element);
-  }
-
-  @Override
-  public void removeAriaBusyState(Element element) {
-    State.BUSY.remove(element);
-  }
-
-  @Override
-  public void removeAriaControlsProperty(Element element) {
-    Property.CONTROLS.remove(element);
-  }
-
-  @Override
-  public void removeAriaDescribedbyProperty(Element element) {
-    Property.DESCRIBEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaDisabledState(Element element) {
-    State.DISABLED.remove(element);
-  }
-
-  @Override
-  public void removeAriaDropeffectProperty(Element element) {
-    Property.DROPEFFECT.remove(element);
-  }
-
-  @Override
   public void removeAriaExpandedState(Element element) {
     State.EXPANDED.remove(element);
   }
 
   @Override
-  public void removeAriaFlowtoProperty(Element element) {
-    Property.FLOWTO.remove(element);
-  }
-
-  @Override
-  public void removeAriaGrabbedState(Element element) {
-    State.GRABBED.remove(element);
-  }
-
-  @Override
-  public void removeAriaHaspopupProperty(Element element) {
-    Property.HASPOPUP.remove(element);
-  }
-
-  @Override
-  public void removeAriaHiddenState(Element element) {
-    State.HIDDEN.remove(element);
-  }
-
-  @Override
-  public void removeAriaInvalidState(Element element) {
-    State.INVALID.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelledbyProperty(Element element) {
-    Property.LABELLEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelProperty(Element element) {
-    Property.LABEL.remove(element);
-  }
-
-  @Override
-  public void removeAriaLiveProperty(Element element) {
-    Property.LIVE.remove(element);
-  }
-
-  @Override
-  public void removeAriaOwnsProperty(Element element) {
-    Property.OWNS.remove(element);
-  }
-
-  @Override
-  public void removeAriaRelevantProperty(Element element) {
-    Property.RELEVANT.remove(element);
-  }
-
-  @Override
-  public void removeTabindexExtraAttribute(Element element) {
-    ExtraAttribute.TABINDEX.remove(element);
-  }
-
-  @Override
-  public void setAriaAtomicProperty(Element element, boolean value) {
-    Property.ATOMIC.set(element, value);
-  }
-
-  @Override
-  public void setAriaBusyState(Element element, boolean value) {
-    State.BUSY.set(element, value);
-  }
-
-  @Override
-  public void setAriaControlsProperty(Element element, IdReference... value) {
-    Property.CONTROLS.set(element, value);
-  }
-
-  @Override
-  public void setAriaDescribedbyProperty(Element element, IdReference... value) {
-    Property.DESCRIBEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaDisabledState(Element element, boolean value) {
-    State.DISABLED.set(element, value);
-  }
-
-  @Override
-  public void setAriaDropeffectProperty(Element element, DropeffectValue... value) {
-    Property.DROPEFFECT.set(element, value);
-  }
-
-  @Override
   public void setAriaExpandedState(Element element, ExpandedValue value) {
     State.EXPANDED.set(element, value);
   }
-
-  @Override
-  public void setAriaFlowtoProperty(Element element, IdReference... value) {
-    Property.FLOWTO.set(element, value);
-  }
-
-  @Override
-  public void setAriaGrabbedState(Element element, GrabbedValue value) {
-    State.GRABBED.set(element, value);
-  }
-
-  @Override
-  public void setAriaHaspopupProperty(Element element, boolean value) {
-    Property.HASPOPUP.set(element, value);
-  }
-
-  @Override
-  public void setAriaHiddenState(Element element, boolean value) {
-    State.HIDDEN.set(element, value);
-  }
-
-  @Override
-  public void setAriaInvalidState(Element element, InvalidValue value) {
-    State.INVALID.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelledbyProperty(Element element, IdReference... value) {
-    Property.LABELLEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelProperty(Element element, String value) {
-    Property.LABEL.set(element, value);
-  }
-
-  @Override
-  public void setAriaLiveProperty(Element element, LiveValue value) {
-    Property.LIVE.set(element, value);
-  }
-
-  @Override
-  public void setAriaOwnsProperty(Element element, IdReference... value) {
-    Property.OWNS.set(element, value);
-  }
-
-  @Override
-  public void setAriaRelevantProperty(Element element, RelevantValue... value) {
-    Property.RELEVANT.set(element, value);
-  }
-
-  @Override
-  public void setTabindexExtraAttribute(Element element, int value) {
-    ExtraAttribute.TABINDEX.set(element, value);
-  }
 }
diff --git a/user/src/com/google/gwt/aria/client/DirectoryRole.java b/user/src/com/google/gwt/aria/client/DirectoryRole.java
index 3bccc30..e0e224c 100644
--- a/user/src/com/google/gwt/aria/client/DirectoryRole.java
+++ b/user/src/com/google/gwt/aria/client/DirectoryRole.java
@@ -17,7 +17,6 @@
 // This is auto-generated code.  Do not manually edit! //
 /////////////////////////////////////////////////////////
 
-
 /**
  * A type that represents the <a href="http://www.w3.org/TR/wai-aria/roles#directory">directory</a>
  * role in the ARIA specification.
diff --git a/user/src/com/google/gwt/aria/client/DirectoryRoleImpl.java b/user/src/com/google/gwt/aria/client/DirectoryRoleImpl.java
index b4ce77b..a9880cb 100644
--- a/user/src/com/google/gwt/aria/client/DirectoryRoleImpl.java
+++ b/user/src/com/google/gwt/aria/client/DirectoryRoleImpl.java
@@ -28,272 +28,17 @@
   }
 
   @Override
-  public String getAriaAtomicProperty(Element element) {
-    return Property.ATOMIC.get(element);
-  }
-
-  @Override
-  public String getAriaBusyState(Element element) {
-    return State.BUSY.get(element);
-  }
-
-  @Override
-  public String getAriaControlsProperty(Element element) {
-    return Property.CONTROLS.get(element);
-  }
-
-  @Override
-  public String getAriaDescribedbyProperty(Element element) {
-    return Property.DESCRIBEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaDisabledState(Element element) {
-    return State.DISABLED.get(element);
-  }
-
-  @Override
-  public String getAriaDropeffectProperty(Element element) {
-    return Property.DROPEFFECT.get(element);
-  }
-
-  @Override
   public String getAriaExpandedState(Element element) {
     return State.EXPANDED.get(element);
   }
 
   @Override
-  public String getAriaFlowtoProperty(Element element) {
-    return Property.FLOWTO.get(element);
-  }
-
-  @Override
-  public String getAriaGrabbedState(Element element) {
-    return State.GRABBED.get(element);
-  }
-
-  @Override
-  public String getAriaHaspopupProperty(Element element) {
-    return Property.HASPOPUP.get(element);
-  }
-
-  @Override
-  public String getAriaHiddenState(Element element) {
-    return State.HIDDEN.get(element);
-  }
-
-  @Override
-  public String getAriaInvalidState(Element element) {
-    return State.INVALID.get(element);
-  }
-
-  @Override
-  public String getAriaLabelledbyProperty(Element element) {
-    return Property.LABELLEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaLabelProperty(Element element) {
-    return Property.LABEL.get(element);
-  }
-
-  @Override
-  public String getAriaLiveProperty(Element element) {
-    return Property.LIVE.get(element);
-  }
-
-  @Override
-  public String getAriaOwnsProperty(Element element) {
-    return Property.OWNS.get(element);
-  }
-
-  @Override
-  public String getAriaRelevantProperty(Element element) {
-    return Property.RELEVANT.get(element);
-  }
-
-  @Override
-  public String getTabindexExtraAttribute(Element element) {
-    return ExtraAttribute.TABINDEX.get(element);
-  }
-
-  @Override
-  public void removeAriaAtomicProperty(Element element) {
-    Property.ATOMIC.remove(element);
-  }
-
-  @Override
-  public void removeAriaBusyState(Element element) {
-    State.BUSY.remove(element);
-  }
-
-  @Override
-  public void removeAriaControlsProperty(Element element) {
-    Property.CONTROLS.remove(element);
-  }
-
-  @Override
-  public void removeAriaDescribedbyProperty(Element element) {
-    Property.DESCRIBEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaDisabledState(Element element) {
-    State.DISABLED.remove(element);
-  }
-
-  @Override
-  public void removeAriaDropeffectProperty(Element element) {
-    Property.DROPEFFECT.remove(element);
-  }
-
-  @Override
   public void removeAriaExpandedState(Element element) {
     State.EXPANDED.remove(element);
   }
 
   @Override
-  public void removeAriaFlowtoProperty(Element element) {
-    Property.FLOWTO.remove(element);
-  }
-
-  @Override
-  public void removeAriaGrabbedState(Element element) {
-    State.GRABBED.remove(element);
-  }
-
-  @Override
-  public void removeAriaHaspopupProperty(Element element) {
-    Property.HASPOPUP.remove(element);
-  }
-
-  @Override
-  public void removeAriaHiddenState(Element element) {
-    State.HIDDEN.remove(element);
-  }
-
-  @Override
-  public void removeAriaInvalidState(Element element) {
-    State.INVALID.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelledbyProperty(Element element) {
-    Property.LABELLEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelProperty(Element element) {
-    Property.LABEL.remove(element);
-  }
-
-  @Override
-  public void removeAriaLiveProperty(Element element) {
-    Property.LIVE.remove(element);
-  }
-
-  @Override
-  public void removeAriaOwnsProperty(Element element) {
-    Property.OWNS.remove(element);
-  }
-
-  @Override
-  public void removeAriaRelevantProperty(Element element) {
-    Property.RELEVANT.remove(element);
-  }
-
-  @Override
-  public void removeTabindexExtraAttribute(Element element) {
-    ExtraAttribute.TABINDEX.remove(element);
-  }
-
-  @Override
-  public void setAriaAtomicProperty(Element element, boolean value) {
-    Property.ATOMIC.set(element, value);
-  }
-
-  @Override
-  public void setAriaBusyState(Element element, boolean value) {
-    State.BUSY.set(element, value);
-  }
-
-  @Override
-  public void setAriaControlsProperty(Element element, IdReference... value) {
-    Property.CONTROLS.set(element, value);
-  }
-
-  @Override
-  public void setAriaDescribedbyProperty(Element element, IdReference... value) {
-    Property.DESCRIBEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaDisabledState(Element element, boolean value) {
-    State.DISABLED.set(element, value);
-  }
-
-  @Override
-  public void setAriaDropeffectProperty(Element element, DropeffectValue... value) {
-    Property.DROPEFFECT.set(element, value);
-  }
-
-  @Override
   public void setAriaExpandedState(Element element, ExpandedValue value) {
     State.EXPANDED.set(element, value);
   }
-
-  @Override
-  public void setAriaFlowtoProperty(Element element, IdReference... value) {
-    Property.FLOWTO.set(element, value);
-  }
-
-  @Override
-  public void setAriaGrabbedState(Element element, GrabbedValue value) {
-    State.GRABBED.set(element, value);
-  }
-
-  @Override
-  public void setAriaHaspopupProperty(Element element, boolean value) {
-    Property.HASPOPUP.set(element, value);
-  }
-
-  @Override
-  public void setAriaHiddenState(Element element, boolean value) {
-    State.HIDDEN.set(element, value);
-  }
-
-  @Override
-  public void setAriaInvalidState(Element element, InvalidValue value) {
-    State.INVALID.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelledbyProperty(Element element, IdReference... value) {
-    Property.LABELLEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelProperty(Element element, String value) {
-    Property.LABEL.set(element, value);
-  }
-
-  @Override
-  public void setAriaLiveProperty(Element element, LiveValue value) {
-    Property.LIVE.set(element, value);
-  }
-
-  @Override
-  public void setAriaOwnsProperty(Element element, IdReference... value) {
-    Property.OWNS.set(element, value);
-  }
-
-  @Override
-  public void setAriaRelevantProperty(Element element, RelevantValue... value) {
-    Property.RELEVANT.set(element, value);
-  }
-
-  @Override
-  public void setTabindexExtraAttribute(Element element, int value) {
-    ExtraAttribute.TABINDEX.set(element, value);
-  }
 }
diff --git a/user/src/com/google/gwt/aria/client/DocumentRoleImpl.java b/user/src/com/google/gwt/aria/client/DocumentRoleImpl.java
index a77c13a..c2ea1b5 100644
--- a/user/src/com/google/gwt/aria/client/DocumentRoleImpl.java
+++ b/user/src/com/google/gwt/aria/client/DocumentRoleImpl.java
@@ -28,272 +28,17 @@
   }
 
   @Override
-  public String getAriaAtomicProperty(Element element) {
-    return Property.ATOMIC.get(element);
-  }
-
-  @Override
-  public String getAriaBusyState(Element element) {
-    return State.BUSY.get(element);
-  }
-
-  @Override
-  public String getAriaControlsProperty(Element element) {
-    return Property.CONTROLS.get(element);
-  }
-
-  @Override
-  public String getAriaDescribedbyProperty(Element element) {
-    return Property.DESCRIBEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaDisabledState(Element element) {
-    return State.DISABLED.get(element);
-  }
-
-  @Override
-  public String getAriaDropeffectProperty(Element element) {
-    return Property.DROPEFFECT.get(element);
-  }
-
-  @Override
   public String getAriaExpandedState(Element element) {
     return State.EXPANDED.get(element);
   }
 
   @Override
-  public String getAriaFlowtoProperty(Element element) {
-    return Property.FLOWTO.get(element);
-  }
-
-  @Override
-  public String getAriaGrabbedState(Element element) {
-    return State.GRABBED.get(element);
-  }
-
-  @Override
-  public String getAriaHaspopupProperty(Element element) {
-    return Property.HASPOPUP.get(element);
-  }
-
-  @Override
-  public String getAriaHiddenState(Element element) {
-    return State.HIDDEN.get(element);
-  }
-
-  @Override
-  public String getAriaInvalidState(Element element) {
-    return State.INVALID.get(element);
-  }
-
-  @Override
-  public String getAriaLabelledbyProperty(Element element) {
-    return Property.LABELLEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaLabelProperty(Element element) {
-    return Property.LABEL.get(element);
-  }
-
-  @Override
-  public String getAriaLiveProperty(Element element) {
-    return Property.LIVE.get(element);
-  }
-
-  @Override
-  public String getAriaOwnsProperty(Element element) {
-    return Property.OWNS.get(element);
-  }
-
-  @Override
-  public String getAriaRelevantProperty(Element element) {
-    return Property.RELEVANT.get(element);
-  }
-
-  @Override
-  public String getTabindexExtraAttribute(Element element) {
-    return ExtraAttribute.TABINDEX.get(element);
-  }
-
-  @Override
-  public void removeAriaAtomicProperty(Element element) {
-    Property.ATOMIC.remove(element);
-  }
-
-  @Override
-  public void removeAriaBusyState(Element element) {
-    State.BUSY.remove(element);
-  }
-
-  @Override
-  public void removeAriaControlsProperty(Element element) {
-    Property.CONTROLS.remove(element);
-  }
-
-  @Override
-  public void removeAriaDescribedbyProperty(Element element) {
-    Property.DESCRIBEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaDisabledState(Element element) {
-    State.DISABLED.remove(element);
-  }
-
-  @Override
-  public void removeAriaDropeffectProperty(Element element) {
-    Property.DROPEFFECT.remove(element);
-  }
-
-  @Override
   public void removeAriaExpandedState(Element element) {
     State.EXPANDED.remove(element);
   }
 
   @Override
-  public void removeAriaFlowtoProperty(Element element) {
-    Property.FLOWTO.remove(element);
-  }
-
-  @Override
-  public void removeAriaGrabbedState(Element element) {
-    State.GRABBED.remove(element);
-  }
-
-  @Override
-  public void removeAriaHaspopupProperty(Element element) {
-    Property.HASPOPUP.remove(element);
-  }
-
-  @Override
-  public void removeAriaHiddenState(Element element) {
-    State.HIDDEN.remove(element);
-  }
-
-  @Override
-  public void removeAriaInvalidState(Element element) {
-    State.INVALID.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelledbyProperty(Element element) {
-    Property.LABELLEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelProperty(Element element) {
-    Property.LABEL.remove(element);
-  }
-
-  @Override
-  public void removeAriaLiveProperty(Element element) {
-    Property.LIVE.remove(element);
-  }
-
-  @Override
-  public void removeAriaOwnsProperty(Element element) {
-    Property.OWNS.remove(element);
-  }
-
-  @Override
-  public void removeAriaRelevantProperty(Element element) {
-    Property.RELEVANT.remove(element);
-  }
-
-  @Override
-  public void removeTabindexExtraAttribute(Element element) {
-    ExtraAttribute.TABINDEX.remove(element);
-  }
-
-  @Override
-  public void setAriaAtomicProperty(Element element, boolean value) {
-    Property.ATOMIC.set(element, value);
-  }
-
-  @Override
-  public void setAriaBusyState(Element element, boolean value) {
-    State.BUSY.set(element, value);
-  }
-
-  @Override
-  public void setAriaControlsProperty(Element element, IdReference... value) {
-    Property.CONTROLS.set(element, value);
-  }
-
-  @Override
-  public void setAriaDescribedbyProperty(Element element, IdReference... value) {
-    Property.DESCRIBEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaDisabledState(Element element, boolean value) {
-    State.DISABLED.set(element, value);
-  }
-
-  @Override
-  public void setAriaDropeffectProperty(Element element, DropeffectValue... value) {
-    Property.DROPEFFECT.set(element, value);
-  }
-
-  @Override
   public void setAriaExpandedState(Element element, ExpandedValue value) {
     State.EXPANDED.set(element, value);
   }
-
-  @Override
-  public void setAriaFlowtoProperty(Element element, IdReference... value) {
-    Property.FLOWTO.set(element, value);
-  }
-
-  @Override
-  public void setAriaGrabbedState(Element element, GrabbedValue value) {
-    State.GRABBED.set(element, value);
-  }
-
-  @Override
-  public void setAriaHaspopupProperty(Element element, boolean value) {
-    Property.HASPOPUP.set(element, value);
-  }
-
-  @Override
-  public void setAriaHiddenState(Element element, boolean value) {
-    State.HIDDEN.set(element, value);
-  }
-
-  @Override
-  public void setAriaInvalidState(Element element, InvalidValue value) {
-    State.INVALID.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelledbyProperty(Element element, IdReference... value) {
-    Property.LABELLEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelProperty(Element element, String value) {
-    Property.LABEL.set(element, value);
-  }
-
-  @Override
-  public void setAriaLiveProperty(Element element, LiveValue value) {
-    Property.LIVE.set(element, value);
-  }
-
-  @Override
-  public void setAriaOwnsProperty(Element element, IdReference... value) {
-    Property.OWNS.set(element, value);
-  }
-
-  @Override
-  public void setAriaRelevantProperty(Element element, RelevantValue... value) {
-    Property.RELEVANT.set(element, value);
-  }
-
-  @Override
-  public void setTabindexExtraAttribute(Element element, int value) {
-    ExtraAttribute.TABINDEX.set(element, value);
-  }
 }
diff --git a/user/src/com/google/gwt/aria/client/FormRole.java b/user/src/com/google/gwt/aria/client/FormRole.java
index c1998b2..0bcb084 100644
--- a/user/src/com/google/gwt/aria/client/FormRole.java
+++ b/user/src/com/google/gwt/aria/client/FormRole.java
@@ -17,7 +17,6 @@
 // This is auto-generated code.  Do not manually edit! //
 /////////////////////////////////////////////////////////
 
-
 /**
  * A type that represents the <a href="http://www.w3.org/TR/wai-aria/roles#form">form</a>
  * role in the ARIA specification.
diff --git a/user/src/com/google/gwt/aria/client/FormRoleImpl.java b/user/src/com/google/gwt/aria/client/FormRoleImpl.java
index 04814a6..58aa365 100644
--- a/user/src/com/google/gwt/aria/client/FormRoleImpl.java
+++ b/user/src/com/google/gwt/aria/client/FormRoleImpl.java
@@ -28,272 +28,17 @@
   }
 
   @Override
-  public String getAriaAtomicProperty(Element element) {
-    return Property.ATOMIC.get(element);
-  }
-
-  @Override
-  public String getAriaBusyState(Element element) {
-    return State.BUSY.get(element);
-  }
-
-  @Override
-  public String getAriaControlsProperty(Element element) {
-    return Property.CONTROLS.get(element);
-  }
-
-  @Override
-  public String getAriaDescribedbyProperty(Element element) {
-    return Property.DESCRIBEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaDisabledState(Element element) {
-    return State.DISABLED.get(element);
-  }
-
-  @Override
-  public String getAriaDropeffectProperty(Element element) {
-    return Property.DROPEFFECT.get(element);
-  }
-
-  @Override
   public String getAriaExpandedState(Element element) {
     return State.EXPANDED.get(element);
   }
 
   @Override
-  public String getAriaFlowtoProperty(Element element) {
-    return Property.FLOWTO.get(element);
-  }
-
-  @Override
-  public String getAriaGrabbedState(Element element) {
-    return State.GRABBED.get(element);
-  }
-
-  @Override
-  public String getAriaHaspopupProperty(Element element) {
-    return Property.HASPOPUP.get(element);
-  }
-
-  @Override
-  public String getAriaHiddenState(Element element) {
-    return State.HIDDEN.get(element);
-  }
-
-  @Override
-  public String getAriaInvalidState(Element element) {
-    return State.INVALID.get(element);
-  }
-
-  @Override
-  public String getAriaLabelledbyProperty(Element element) {
-    return Property.LABELLEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaLabelProperty(Element element) {
-    return Property.LABEL.get(element);
-  }
-
-  @Override
-  public String getAriaLiveProperty(Element element) {
-    return Property.LIVE.get(element);
-  }
-
-  @Override
-  public String getAriaOwnsProperty(Element element) {
-    return Property.OWNS.get(element);
-  }
-
-  @Override
-  public String getAriaRelevantProperty(Element element) {
-    return Property.RELEVANT.get(element);
-  }
-
-  @Override
-  public String getTabindexExtraAttribute(Element element) {
-    return ExtraAttribute.TABINDEX.get(element);
-  }
-
-  @Override
-  public void removeAriaAtomicProperty(Element element) {
-    Property.ATOMIC.remove(element);
-  }
-
-  @Override
-  public void removeAriaBusyState(Element element) {
-    State.BUSY.remove(element);
-  }
-
-  @Override
-  public void removeAriaControlsProperty(Element element) {
-    Property.CONTROLS.remove(element);
-  }
-
-  @Override
-  public void removeAriaDescribedbyProperty(Element element) {
-    Property.DESCRIBEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaDisabledState(Element element) {
-    State.DISABLED.remove(element);
-  }
-
-  @Override
-  public void removeAriaDropeffectProperty(Element element) {
-    Property.DROPEFFECT.remove(element);
-  }
-
-  @Override
   public void removeAriaExpandedState(Element element) {
     State.EXPANDED.remove(element);
   }
 
   @Override
-  public void removeAriaFlowtoProperty(Element element) {
-    Property.FLOWTO.remove(element);
-  }
-
-  @Override
-  public void removeAriaGrabbedState(Element element) {
-    State.GRABBED.remove(element);
-  }
-
-  @Override
-  public void removeAriaHaspopupProperty(Element element) {
-    Property.HASPOPUP.remove(element);
-  }
-
-  @Override
-  public void removeAriaHiddenState(Element element) {
-    State.HIDDEN.remove(element);
-  }
-
-  @Override
-  public void removeAriaInvalidState(Element element) {
-    State.INVALID.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelledbyProperty(Element element) {
-    Property.LABELLEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelProperty(Element element) {
-    Property.LABEL.remove(element);
-  }
-
-  @Override
-  public void removeAriaLiveProperty(Element element) {
-    Property.LIVE.remove(element);
-  }
-
-  @Override
-  public void removeAriaOwnsProperty(Element element) {
-    Property.OWNS.remove(element);
-  }
-
-  @Override
-  public void removeAriaRelevantProperty(Element element) {
-    Property.RELEVANT.remove(element);
-  }
-
-  @Override
-  public void removeTabindexExtraAttribute(Element element) {
-    ExtraAttribute.TABINDEX.remove(element);
-  }
-
-  @Override
-  public void setAriaAtomicProperty(Element element, boolean value) {
-    Property.ATOMIC.set(element, value);
-  }
-
-  @Override
-  public void setAriaBusyState(Element element, boolean value) {
-    State.BUSY.set(element, value);
-  }
-
-  @Override
-  public void setAriaControlsProperty(Element element, IdReference... value) {
-    Property.CONTROLS.set(element, value);
-  }
-
-  @Override
-  public void setAriaDescribedbyProperty(Element element, IdReference... value) {
-    Property.DESCRIBEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaDisabledState(Element element, boolean value) {
-    State.DISABLED.set(element, value);
-  }
-
-  @Override
-  public void setAriaDropeffectProperty(Element element, DropeffectValue... value) {
-    Property.DROPEFFECT.set(element, value);
-  }
-
-  @Override
   public void setAriaExpandedState(Element element, ExpandedValue value) {
     State.EXPANDED.set(element, value);
   }
-
-  @Override
-  public void setAriaFlowtoProperty(Element element, IdReference... value) {
-    Property.FLOWTO.set(element, value);
-  }
-
-  @Override
-  public void setAriaGrabbedState(Element element, GrabbedValue value) {
-    State.GRABBED.set(element, value);
-  }
-
-  @Override
-  public void setAriaHaspopupProperty(Element element, boolean value) {
-    Property.HASPOPUP.set(element, value);
-  }
-
-  @Override
-  public void setAriaHiddenState(Element element, boolean value) {
-    State.HIDDEN.set(element, value);
-  }
-
-  @Override
-  public void setAriaInvalidState(Element element, InvalidValue value) {
-    State.INVALID.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelledbyProperty(Element element, IdReference... value) {
-    Property.LABELLEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelProperty(Element element, String value) {
-    Property.LABEL.set(element, value);
-  }
-
-  @Override
-  public void setAriaLiveProperty(Element element, LiveValue value) {
-    Property.LIVE.set(element, value);
-  }
-
-  @Override
-  public void setAriaOwnsProperty(Element element, IdReference... value) {
-    Property.OWNS.set(element, value);
-  }
-
-  @Override
-  public void setAriaRelevantProperty(Element element, RelevantValue... value) {
-    Property.RELEVANT.set(element, value);
-  }
-
-  @Override
-  public void setTabindexExtraAttribute(Element element, int value) {
-    ExtraAttribute.TABINDEX.set(element, value);
-  }
 }
diff --git a/user/src/com/google/gwt/aria/client/GridRoleImpl.java b/user/src/com/google/gwt/aria/client/GridRoleImpl.java
index 64e30ab..2e91f01 100644
--- a/user/src/com/google/gwt/aria/client/GridRoleImpl.java
+++ b/user/src/com/google/gwt/aria/client/GridRoleImpl.java
@@ -33,327 +33,72 @@
   }
 
   @Override
-  public String getAriaAtomicProperty(Element element) {
-    return Property.ATOMIC.get(element);
-  }
-
-  @Override
-  public String getAriaBusyState(Element element) {
-    return State.BUSY.get(element);
-  }
-
-  @Override
-  public String getAriaControlsProperty(Element element) {
-    return Property.CONTROLS.get(element);
-  }
-
-  @Override
-  public String getAriaDescribedbyProperty(Element element) {
-    return Property.DESCRIBEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaDisabledState(Element element) {
-    return State.DISABLED.get(element);
-  }
-
-  @Override
-  public String getAriaDropeffectProperty(Element element) {
-    return Property.DROPEFFECT.get(element);
-  }
-
-  @Override
   public String getAriaExpandedState(Element element) {
     return State.EXPANDED.get(element);
   }
 
   @Override
-  public String getAriaFlowtoProperty(Element element) {
-    return Property.FLOWTO.get(element);
-  }
-
-  @Override
-  public String getAriaGrabbedState(Element element) {
-    return State.GRABBED.get(element);
-  }
-
-  @Override
-  public String getAriaHaspopupProperty(Element element) {
-    return Property.HASPOPUP.get(element);
-  }
-
-  @Override
-  public String getAriaHiddenState(Element element) {
-    return State.HIDDEN.get(element);
-  }
-
-  @Override
-  public String getAriaInvalidState(Element element) {
-    return State.INVALID.get(element);
-  }
-
-  @Override
-  public String getAriaLabelledbyProperty(Element element) {
-    return Property.LABELLEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaLabelProperty(Element element) {
-    return Property.LABEL.get(element);
-  }
-
-  @Override
   public String getAriaLevelProperty(Element element) {
     return Property.LEVEL.get(element);
   }
 
   @Override
-  public String getAriaLiveProperty(Element element) {
-    return Property.LIVE.get(element);
-  }
-
-  @Override
   public String getAriaMultiselectableProperty(Element element) {
     return Property.MULTISELECTABLE.get(element);
   }
 
   @Override
-  public String getAriaOwnsProperty(Element element) {
-    return Property.OWNS.get(element);
-  }
-
-  @Override
   public String getAriaReadonlyProperty(Element element) {
     return Property.READONLY.get(element);
   }
 
   @Override
-  public String getAriaRelevantProperty(Element element) {
-    return Property.RELEVANT.get(element);
-  }
-
-  @Override
-  public String getTabindexExtraAttribute(Element element) {
-    return ExtraAttribute.TABINDEX.get(element);
-  }
-
-  @Override
   public void removeAriaActivedescendantProperty(Element element) {
     Property.ACTIVEDESCENDANT.remove(element);
   }
 
   @Override
-  public void removeAriaAtomicProperty(Element element) {
-    Property.ATOMIC.remove(element);
-  }
-
-  @Override
-  public void removeAriaBusyState(Element element) {
-    State.BUSY.remove(element);
-  }
-
-  @Override
-  public void removeAriaControlsProperty(Element element) {
-    Property.CONTROLS.remove(element);
-  }
-
-  @Override
-  public void removeAriaDescribedbyProperty(Element element) {
-    Property.DESCRIBEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaDisabledState(Element element) {
-    State.DISABLED.remove(element);
-  }
-
-  @Override
-  public void removeAriaDropeffectProperty(Element element) {
-    Property.DROPEFFECT.remove(element);
-  }
-
-  @Override
   public void removeAriaExpandedState(Element element) {
     State.EXPANDED.remove(element);
   }
 
   @Override
-  public void removeAriaFlowtoProperty(Element element) {
-    Property.FLOWTO.remove(element);
-  }
-
-  @Override
-  public void removeAriaGrabbedState(Element element) {
-    State.GRABBED.remove(element);
-  }
-
-  @Override
-  public void removeAriaHaspopupProperty(Element element) {
-    Property.HASPOPUP.remove(element);
-  }
-
-  @Override
-  public void removeAriaHiddenState(Element element) {
-    State.HIDDEN.remove(element);
-  }
-
-  @Override
-  public void removeAriaInvalidState(Element element) {
-    State.INVALID.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelledbyProperty(Element element) {
-    Property.LABELLEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelProperty(Element element) {
-    Property.LABEL.remove(element);
-  }
-
-  @Override
   public void removeAriaLevelProperty(Element element) {
     Property.LEVEL.remove(element);
   }
 
   @Override
-  public void removeAriaLiveProperty(Element element) {
-    Property.LIVE.remove(element);
-  }
-
-  @Override
   public void removeAriaMultiselectableProperty(Element element) {
     Property.MULTISELECTABLE.remove(element);
   }
 
   @Override
-  public void removeAriaOwnsProperty(Element element) {
-    Property.OWNS.remove(element);
-  }
-
-  @Override
   public void removeAriaReadonlyProperty(Element element) {
     Property.READONLY.remove(element);
   }
 
   @Override
-  public void removeAriaRelevantProperty(Element element) {
-    Property.RELEVANT.remove(element);
-  }
-
-  @Override
-  public void removeTabindexExtraAttribute(Element element) {
-    ExtraAttribute.TABINDEX.remove(element);
-  }
-
-  @Override
   public void setAriaActivedescendantProperty(Element element, IdReference value) {
     Property.ACTIVEDESCENDANT.set(element, value);
   }
 
   @Override
-  public void setAriaAtomicProperty(Element element, boolean value) {
-    Property.ATOMIC.set(element, value);
-  }
-
-  @Override
-  public void setAriaBusyState(Element element, boolean value) {
-    State.BUSY.set(element, value);
-  }
-
-  @Override
-  public void setAriaControlsProperty(Element element, IdReference... value) {
-    Property.CONTROLS.set(element, value);
-  }
-
-  @Override
-  public void setAriaDescribedbyProperty(Element element, IdReference... value) {
-    Property.DESCRIBEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaDisabledState(Element element, boolean value) {
-    State.DISABLED.set(element, value);
-  }
-
-  @Override
-  public void setAriaDropeffectProperty(Element element, DropeffectValue... value) {
-    Property.DROPEFFECT.set(element, value);
-  }
-
-  @Override
   public void setAriaExpandedState(Element element, ExpandedValue value) {
     State.EXPANDED.set(element, value);
   }
 
   @Override
-  public void setAriaFlowtoProperty(Element element, IdReference... value) {
-    Property.FLOWTO.set(element, value);
-  }
-
-  @Override
-  public void setAriaGrabbedState(Element element, GrabbedValue value) {
-    State.GRABBED.set(element, value);
-  }
-
-  @Override
-  public void setAriaHaspopupProperty(Element element, boolean value) {
-    Property.HASPOPUP.set(element, value);
-  }
-
-  @Override
-  public void setAriaHiddenState(Element element, boolean value) {
-    State.HIDDEN.set(element, value);
-  }
-
-  @Override
-  public void setAriaInvalidState(Element element, InvalidValue value) {
-    State.INVALID.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelledbyProperty(Element element, IdReference... value) {
-    Property.LABELLEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelProperty(Element element, String value) {
-    Property.LABEL.set(element, value);
-  }
-
-  @Override
   public void setAriaLevelProperty(Element element, int value) {
     Property.LEVEL.set(element, value);
   }
 
   @Override
-  public void setAriaLiveProperty(Element element, LiveValue value) {
-    Property.LIVE.set(element, value);
-  }
-
-  @Override
   public void setAriaMultiselectableProperty(Element element, boolean value) {
     Property.MULTISELECTABLE.set(element, value);
   }
 
   @Override
-  public void setAriaOwnsProperty(Element element, IdReference... value) {
-    Property.OWNS.set(element, value);
-  }
-
-  @Override
   public void setAriaReadonlyProperty(Element element, boolean value) {
     Property.READONLY.set(element, value);
   }
-
-  @Override
-  public void setAriaRelevantProperty(Element element, RelevantValue... value) {
-    Property.RELEVANT.set(element, value);
-  }
-
-  @Override
-  public void setTabindexExtraAttribute(Element element, int value) {
-    ExtraAttribute.TABINDEX.set(element, value);
-  }
 }
diff --git a/user/src/com/google/gwt/aria/client/GridcellRoleImpl.java b/user/src/com/google/gwt/aria/client/GridcellRoleImpl.java
index b058502..313a0dc 100644
--- a/user/src/com/google/gwt/aria/client/GridcellRoleImpl.java
+++ b/user/src/com/google/gwt/aria/client/GridcellRoleImpl.java
@@ -28,96 +28,16 @@
   }
 
   @Override
-  public String getAriaAtomicProperty(Element element) {
-    return Property.ATOMIC.get(element);
-  }
-
-  @Override
-  public String getAriaBusyState(Element element) {
-    return State.BUSY.get(element);
-  }
-
-  @Override
-  public String getAriaControlsProperty(Element element) {
-    return Property.CONTROLS.get(element);
-  }
-
-  @Override
-  public String getAriaDescribedbyProperty(Element element) {
-    return Property.DESCRIBEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaDisabledState(Element element) {
-    return State.DISABLED.get(element);
-  }
-
-  @Override
-  public String getAriaDropeffectProperty(Element element) {
-    return Property.DROPEFFECT.get(element);
-  }
-
-  @Override
   public String getAriaExpandedState(Element element) {
     return State.EXPANDED.get(element);
   }
 
   @Override
-  public String getAriaFlowtoProperty(Element element) {
-    return Property.FLOWTO.get(element);
-  }
-
-  @Override
-  public String getAriaGrabbedState(Element element) {
-    return State.GRABBED.get(element);
-  }
-
-  @Override
-  public String getAriaHaspopupProperty(Element element) {
-    return Property.HASPOPUP.get(element);
-  }
-
-  @Override
-  public String getAriaHiddenState(Element element) {
-    return State.HIDDEN.get(element);
-  }
-
-  @Override
-  public String getAriaInvalidState(Element element) {
-    return State.INVALID.get(element);
-  }
-
-  @Override
-  public String getAriaLabelledbyProperty(Element element) {
-    return Property.LABELLEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaLabelProperty(Element element) {
-    return Property.LABEL.get(element);
-  }
-
-  @Override
-  public String getAriaLiveProperty(Element element) {
-    return Property.LIVE.get(element);
-  }
-
-  @Override
-  public String getAriaOwnsProperty(Element element) {
-    return Property.OWNS.get(element);
-  }
-
-  @Override
   public String getAriaReadonlyProperty(Element element) {
     return Property.READONLY.get(element);
   }
 
   @Override
-  public String getAriaRelevantProperty(Element element) {
-    return Property.RELEVANT.get(element);
-  }
-
-  @Override
   public String getAriaRequiredProperty(Element element) {
     return Property.REQUIRED.get(element);
   }
@@ -128,101 +48,16 @@
   }
 
   @Override
-  public String getTabindexExtraAttribute(Element element) {
-    return ExtraAttribute.TABINDEX.get(element);
-  }
-
-  @Override
-  public void removeAriaAtomicProperty(Element element) {
-    Property.ATOMIC.remove(element);
-  }
-
-  @Override
-  public void removeAriaBusyState(Element element) {
-    State.BUSY.remove(element);
-  }
-
-  @Override
-  public void removeAriaControlsProperty(Element element) {
-    Property.CONTROLS.remove(element);
-  }
-
-  @Override
-  public void removeAriaDescribedbyProperty(Element element) {
-    Property.DESCRIBEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaDisabledState(Element element) {
-    State.DISABLED.remove(element);
-  }
-
-  @Override
-  public void removeAriaDropeffectProperty(Element element) {
-    Property.DROPEFFECT.remove(element);
-  }
-
-  @Override
   public void removeAriaExpandedState(Element element) {
     State.EXPANDED.remove(element);
   }
 
   @Override
-  public void removeAriaFlowtoProperty(Element element) {
-    Property.FLOWTO.remove(element);
-  }
-
-  @Override
-  public void removeAriaGrabbedState(Element element) {
-    State.GRABBED.remove(element);
-  }
-
-  @Override
-  public void removeAriaHaspopupProperty(Element element) {
-    Property.HASPOPUP.remove(element);
-  }
-
-  @Override
-  public void removeAriaHiddenState(Element element) {
-    State.HIDDEN.remove(element);
-  }
-
-  @Override
-  public void removeAriaInvalidState(Element element) {
-    State.INVALID.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelledbyProperty(Element element) {
-    Property.LABELLEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelProperty(Element element) {
-    Property.LABEL.remove(element);
-  }
-
-  @Override
-  public void removeAriaLiveProperty(Element element) {
-    Property.LIVE.remove(element);
-  }
-
-  @Override
-  public void removeAriaOwnsProperty(Element element) {
-    Property.OWNS.remove(element);
-  }
-
-  @Override
   public void removeAriaReadonlyProperty(Element element) {
     Property.READONLY.remove(element);
   }
 
   @Override
-  public void removeAriaRelevantProperty(Element element) {
-    Property.RELEVANT.remove(element);
-  }
-
-  @Override
   public void removeAriaRequiredProperty(Element element) {
     Property.REQUIRED.remove(element);
   }
@@ -233,101 +68,16 @@
   }
 
   @Override
-  public void removeTabindexExtraAttribute(Element element) {
-    ExtraAttribute.TABINDEX.remove(element);
-  }
-
-  @Override
-  public void setAriaAtomicProperty(Element element, boolean value) {
-    Property.ATOMIC.set(element, value);
-  }
-
-  @Override
-  public void setAriaBusyState(Element element, boolean value) {
-    State.BUSY.set(element, value);
-  }
-
-  @Override
-  public void setAriaControlsProperty(Element element, IdReference... value) {
-    Property.CONTROLS.set(element, value);
-  }
-
-  @Override
-  public void setAriaDescribedbyProperty(Element element, IdReference... value) {
-    Property.DESCRIBEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaDisabledState(Element element, boolean value) {
-    State.DISABLED.set(element, value);
-  }
-
-  @Override
-  public void setAriaDropeffectProperty(Element element, DropeffectValue... value) {
-    Property.DROPEFFECT.set(element, value);
-  }
-
-  @Override
   public void setAriaExpandedState(Element element, ExpandedValue value) {
     State.EXPANDED.set(element, value);
   }
 
   @Override
-  public void setAriaFlowtoProperty(Element element, IdReference... value) {
-    Property.FLOWTO.set(element, value);
-  }
-
-  @Override
-  public void setAriaGrabbedState(Element element, GrabbedValue value) {
-    State.GRABBED.set(element, value);
-  }
-
-  @Override
-  public void setAriaHaspopupProperty(Element element, boolean value) {
-    Property.HASPOPUP.set(element, value);
-  }
-
-  @Override
-  public void setAriaHiddenState(Element element, boolean value) {
-    State.HIDDEN.set(element, value);
-  }
-
-  @Override
-  public void setAriaInvalidState(Element element, InvalidValue value) {
-    State.INVALID.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelledbyProperty(Element element, IdReference... value) {
-    Property.LABELLEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelProperty(Element element, String value) {
-    Property.LABEL.set(element, value);
-  }
-
-  @Override
-  public void setAriaLiveProperty(Element element, LiveValue value) {
-    Property.LIVE.set(element, value);
-  }
-
-  @Override
-  public void setAriaOwnsProperty(Element element, IdReference... value) {
-    Property.OWNS.set(element, value);
-  }
-
-  @Override
   public void setAriaReadonlyProperty(Element element, boolean value) {
     Property.READONLY.set(element, value);
   }
 
   @Override
-  public void setAriaRelevantProperty(Element element, RelevantValue... value) {
-    Property.RELEVANT.set(element, value);
-  }
-
-  @Override
   public void setAriaRequiredProperty(Element element, boolean value) {
     Property.REQUIRED.set(element, value);
   }
@@ -336,9 +86,4 @@
   public void setAriaSelectedState(Element element, SelectedValue value) {
     State.SELECTED.set(element, value);
   }
-
-  @Override
-  public void setTabindexExtraAttribute(Element element, int value) {
-    ExtraAttribute.TABINDEX.set(element, value);
-  }
 }
diff --git a/user/src/com/google/gwt/aria/client/GroupRoleImpl.java b/user/src/com/google/gwt/aria/client/GroupRoleImpl.java
index 47864f2..b6b4f2f 100644
--- a/user/src/com/google/gwt/aria/client/GroupRoleImpl.java
+++ b/user/src/com/google/gwt/aria/client/GroupRoleImpl.java
@@ -33,282 +33,27 @@
   }
 
   @Override
-  public String getAriaAtomicProperty(Element element) {
-    return Property.ATOMIC.get(element);
-  }
-
-  @Override
-  public String getAriaBusyState(Element element) {
-    return State.BUSY.get(element);
-  }
-
-  @Override
-  public String getAriaControlsProperty(Element element) {
-    return Property.CONTROLS.get(element);
-  }
-
-  @Override
-  public String getAriaDescribedbyProperty(Element element) {
-    return Property.DESCRIBEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaDisabledState(Element element) {
-    return State.DISABLED.get(element);
-  }
-
-  @Override
-  public String getAriaDropeffectProperty(Element element) {
-    return Property.DROPEFFECT.get(element);
-  }
-
-  @Override
   public String getAriaExpandedState(Element element) {
     return State.EXPANDED.get(element);
   }
 
   @Override
-  public String getAriaFlowtoProperty(Element element) {
-    return Property.FLOWTO.get(element);
-  }
-
-  @Override
-  public String getAriaGrabbedState(Element element) {
-    return State.GRABBED.get(element);
-  }
-
-  @Override
-  public String getAriaHaspopupProperty(Element element) {
-    return Property.HASPOPUP.get(element);
-  }
-
-  @Override
-  public String getAriaHiddenState(Element element) {
-    return State.HIDDEN.get(element);
-  }
-
-  @Override
-  public String getAriaInvalidState(Element element) {
-    return State.INVALID.get(element);
-  }
-
-  @Override
-  public String getAriaLabelledbyProperty(Element element) {
-    return Property.LABELLEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaLabelProperty(Element element) {
-    return Property.LABEL.get(element);
-  }
-
-  @Override
-  public String getAriaLiveProperty(Element element) {
-    return Property.LIVE.get(element);
-  }
-
-  @Override
-  public String getAriaOwnsProperty(Element element) {
-    return Property.OWNS.get(element);
-  }
-
-  @Override
-  public String getAriaRelevantProperty(Element element) {
-    return Property.RELEVANT.get(element);
-  }
-
-  @Override
-  public String getTabindexExtraAttribute(Element element) {
-    return ExtraAttribute.TABINDEX.get(element);
-  }
-
-  @Override
   public void removeAriaActivedescendantProperty(Element element) {
     Property.ACTIVEDESCENDANT.remove(element);
   }
 
   @Override
-  public void removeAriaAtomicProperty(Element element) {
-    Property.ATOMIC.remove(element);
-  }
-
-  @Override
-  public void removeAriaBusyState(Element element) {
-    State.BUSY.remove(element);
-  }
-
-  @Override
-  public void removeAriaControlsProperty(Element element) {
-    Property.CONTROLS.remove(element);
-  }
-
-  @Override
-  public void removeAriaDescribedbyProperty(Element element) {
-    Property.DESCRIBEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaDisabledState(Element element) {
-    State.DISABLED.remove(element);
-  }
-
-  @Override
-  public void removeAriaDropeffectProperty(Element element) {
-    Property.DROPEFFECT.remove(element);
-  }
-
-  @Override
   public void removeAriaExpandedState(Element element) {
     State.EXPANDED.remove(element);
   }
 
   @Override
-  public void removeAriaFlowtoProperty(Element element) {
-    Property.FLOWTO.remove(element);
-  }
-
-  @Override
-  public void removeAriaGrabbedState(Element element) {
-    State.GRABBED.remove(element);
-  }
-
-  @Override
-  public void removeAriaHaspopupProperty(Element element) {
-    Property.HASPOPUP.remove(element);
-  }
-
-  @Override
-  public void removeAriaHiddenState(Element element) {
-    State.HIDDEN.remove(element);
-  }
-
-  @Override
-  public void removeAriaInvalidState(Element element) {
-    State.INVALID.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelledbyProperty(Element element) {
-    Property.LABELLEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelProperty(Element element) {
-    Property.LABEL.remove(element);
-  }
-
-  @Override
-  public void removeAriaLiveProperty(Element element) {
-    Property.LIVE.remove(element);
-  }
-
-  @Override
-  public void removeAriaOwnsProperty(Element element) {
-    Property.OWNS.remove(element);
-  }
-
-  @Override
-  public void removeAriaRelevantProperty(Element element) {
-    Property.RELEVANT.remove(element);
-  }
-
-  @Override
-  public void removeTabindexExtraAttribute(Element element) {
-    ExtraAttribute.TABINDEX.remove(element);
-  }
-
-  @Override
   public void setAriaActivedescendantProperty(Element element, IdReference value) {
     Property.ACTIVEDESCENDANT.set(element, value);
   }
 
   @Override
-  public void setAriaAtomicProperty(Element element, boolean value) {
-    Property.ATOMIC.set(element, value);
-  }
-
-  @Override
-  public void setAriaBusyState(Element element, boolean value) {
-    State.BUSY.set(element, value);
-  }
-
-  @Override
-  public void setAriaControlsProperty(Element element, IdReference... value) {
-    Property.CONTROLS.set(element, value);
-  }
-
-  @Override
-  public void setAriaDescribedbyProperty(Element element, IdReference... value) {
-    Property.DESCRIBEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaDisabledState(Element element, boolean value) {
-    State.DISABLED.set(element, value);
-  }
-
-  @Override
-  public void setAriaDropeffectProperty(Element element, DropeffectValue... value) {
-    Property.DROPEFFECT.set(element, value);
-  }
-
-  @Override
   public void setAriaExpandedState(Element element, ExpandedValue value) {
     State.EXPANDED.set(element, value);
   }
-
-  @Override
-  public void setAriaFlowtoProperty(Element element, IdReference... value) {
-    Property.FLOWTO.set(element, value);
-  }
-
-  @Override
-  public void setAriaGrabbedState(Element element, GrabbedValue value) {
-    State.GRABBED.set(element, value);
-  }
-
-  @Override
-  public void setAriaHaspopupProperty(Element element, boolean value) {
-    Property.HASPOPUP.set(element, value);
-  }
-
-  @Override
-  public void setAriaHiddenState(Element element, boolean value) {
-    State.HIDDEN.set(element, value);
-  }
-
-  @Override
-  public void setAriaInvalidState(Element element, InvalidValue value) {
-    State.INVALID.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelledbyProperty(Element element, IdReference... value) {
-    Property.LABELLEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelProperty(Element element, String value) {
-    Property.LABEL.set(element, value);
-  }
-
-  @Override
-  public void setAriaLiveProperty(Element element, LiveValue value) {
-    Property.LIVE.set(element, value);
-  }
-
-  @Override
-  public void setAriaOwnsProperty(Element element, IdReference... value) {
-    Property.OWNS.set(element, value);
-  }
-
-  @Override
-  public void setAriaRelevantProperty(Element element, RelevantValue... value) {
-    Property.RELEVANT.set(element, value);
-  }
-
-  @Override
-  public void setTabindexExtraAttribute(Element element, int value) {
-    ExtraAttribute.TABINDEX.set(element, value);
-  }
 }
diff --git a/user/src/com/google/gwt/aria/client/HeadingRoleImpl.java b/user/src/com/google/gwt/aria/client/HeadingRoleImpl.java
index fd89243..8ea3aef 100644
--- a/user/src/com/google/gwt/aria/client/HeadingRoleImpl.java
+++ b/user/src/com/google/gwt/aria/client/HeadingRoleImpl.java
@@ -28,287 +28,32 @@
   }
 
   @Override
-  public String getAriaAtomicProperty(Element element) {
-    return Property.ATOMIC.get(element);
-  }
-
-  @Override
-  public String getAriaBusyState(Element element) {
-    return State.BUSY.get(element);
-  }
-
-  @Override
-  public String getAriaControlsProperty(Element element) {
-    return Property.CONTROLS.get(element);
-  }
-
-  @Override
-  public String getAriaDescribedbyProperty(Element element) {
-    return Property.DESCRIBEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaDisabledState(Element element) {
-    return State.DISABLED.get(element);
-  }
-
-  @Override
-  public String getAriaDropeffectProperty(Element element) {
-    return Property.DROPEFFECT.get(element);
-  }
-
-  @Override
   public String getAriaExpandedState(Element element) {
     return State.EXPANDED.get(element);
   }
 
   @Override
-  public String getAriaFlowtoProperty(Element element) {
-    return Property.FLOWTO.get(element);
-  }
-
-  @Override
-  public String getAriaGrabbedState(Element element) {
-    return State.GRABBED.get(element);
-  }
-
-  @Override
-  public String getAriaHaspopupProperty(Element element) {
-    return Property.HASPOPUP.get(element);
-  }
-
-  @Override
-  public String getAriaHiddenState(Element element) {
-    return State.HIDDEN.get(element);
-  }
-
-  @Override
-  public String getAriaInvalidState(Element element) {
-    return State.INVALID.get(element);
-  }
-
-  @Override
-  public String getAriaLabelledbyProperty(Element element) {
-    return Property.LABELLEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaLabelProperty(Element element) {
-    return Property.LABEL.get(element);
-  }
-
-  @Override
   public String getAriaLevelProperty(Element element) {
     return Property.LEVEL.get(element);
   }
 
   @Override
-  public String getAriaLiveProperty(Element element) {
-    return Property.LIVE.get(element);
-  }
-
-  @Override
-  public String getAriaOwnsProperty(Element element) {
-    return Property.OWNS.get(element);
-  }
-
-  @Override
-  public String getAriaRelevantProperty(Element element) {
-    return Property.RELEVANT.get(element);
-  }
-
-  @Override
-  public String getTabindexExtraAttribute(Element element) {
-    return ExtraAttribute.TABINDEX.get(element);
-  }
-
-  @Override
-  public void removeAriaAtomicProperty(Element element) {
-    Property.ATOMIC.remove(element);
-  }
-
-  @Override
-  public void removeAriaBusyState(Element element) {
-    State.BUSY.remove(element);
-  }
-
-  @Override
-  public void removeAriaControlsProperty(Element element) {
-    Property.CONTROLS.remove(element);
-  }
-
-  @Override
-  public void removeAriaDescribedbyProperty(Element element) {
-    Property.DESCRIBEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaDisabledState(Element element) {
-    State.DISABLED.remove(element);
-  }
-
-  @Override
-  public void removeAriaDropeffectProperty(Element element) {
-    Property.DROPEFFECT.remove(element);
-  }
-
-  @Override
   public void removeAriaExpandedState(Element element) {
     State.EXPANDED.remove(element);
   }
 
   @Override
-  public void removeAriaFlowtoProperty(Element element) {
-    Property.FLOWTO.remove(element);
-  }
-
-  @Override
-  public void removeAriaGrabbedState(Element element) {
-    State.GRABBED.remove(element);
-  }
-
-  @Override
-  public void removeAriaHaspopupProperty(Element element) {
-    Property.HASPOPUP.remove(element);
-  }
-
-  @Override
-  public void removeAriaHiddenState(Element element) {
-    State.HIDDEN.remove(element);
-  }
-
-  @Override
-  public void removeAriaInvalidState(Element element) {
-    State.INVALID.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelledbyProperty(Element element) {
-    Property.LABELLEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelProperty(Element element) {
-    Property.LABEL.remove(element);
-  }
-
-  @Override
   public void removeAriaLevelProperty(Element element) {
     Property.LEVEL.remove(element);
   }
 
   @Override
-  public void removeAriaLiveProperty(Element element) {
-    Property.LIVE.remove(element);
-  }
-
-  @Override
-  public void removeAriaOwnsProperty(Element element) {
-    Property.OWNS.remove(element);
-  }
-
-  @Override
-  public void removeAriaRelevantProperty(Element element) {
-    Property.RELEVANT.remove(element);
-  }
-
-  @Override
-  public void removeTabindexExtraAttribute(Element element) {
-    ExtraAttribute.TABINDEX.remove(element);
-  }
-
-  @Override
-  public void setAriaAtomicProperty(Element element, boolean value) {
-    Property.ATOMIC.set(element, value);
-  }
-
-  @Override
-  public void setAriaBusyState(Element element, boolean value) {
-    State.BUSY.set(element, value);
-  }
-
-  @Override
-  public void setAriaControlsProperty(Element element, IdReference... value) {
-    Property.CONTROLS.set(element, value);
-  }
-
-  @Override
-  public void setAriaDescribedbyProperty(Element element, IdReference... value) {
-    Property.DESCRIBEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaDisabledState(Element element, boolean value) {
-    State.DISABLED.set(element, value);
-  }
-
-  @Override
-  public void setAriaDropeffectProperty(Element element, DropeffectValue... value) {
-    Property.DROPEFFECT.set(element, value);
-  }
-
-  @Override
   public void setAriaExpandedState(Element element, ExpandedValue value) {
     State.EXPANDED.set(element, value);
   }
 
   @Override
-  public void setAriaFlowtoProperty(Element element, IdReference... value) {
-    Property.FLOWTO.set(element, value);
-  }
-
-  @Override
-  public void setAriaGrabbedState(Element element, GrabbedValue value) {
-    State.GRABBED.set(element, value);
-  }
-
-  @Override
-  public void setAriaHaspopupProperty(Element element, boolean value) {
-    Property.HASPOPUP.set(element, value);
-  }
-
-  @Override
-  public void setAriaHiddenState(Element element, boolean value) {
-    State.HIDDEN.set(element, value);
-  }
-
-  @Override
-  public void setAriaInvalidState(Element element, InvalidValue value) {
-    State.INVALID.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelledbyProperty(Element element, IdReference... value) {
-    Property.LABELLEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelProperty(Element element, String value) {
-    Property.LABEL.set(element, value);
-  }
-
-  @Override
   public void setAriaLevelProperty(Element element, int value) {
     Property.LEVEL.set(element, value);
   }
-
-  @Override
-  public void setAriaLiveProperty(Element element, LiveValue value) {
-    Property.LIVE.set(element, value);
-  }
-
-  @Override
-  public void setAriaOwnsProperty(Element element, IdReference... value) {
-    Property.OWNS.set(element, value);
-  }
-
-  @Override
-  public void setAriaRelevantProperty(Element element, RelevantValue... value) {
-    Property.RELEVANT.set(element, value);
-  }
-
-  @Override
-  public void setTabindexExtraAttribute(Element element, int value) {
-    ExtraAttribute.TABINDEX.set(element, value);
-  }
 }
diff --git a/user/src/com/google/gwt/aria/client/ImgRole.java b/user/src/com/google/gwt/aria/client/ImgRole.java
index 0c5eb86..72b55c8 100644
--- a/user/src/com/google/gwt/aria/client/ImgRole.java
+++ b/user/src/com/google/gwt/aria/client/ImgRole.java
@@ -17,7 +17,6 @@
 // This is auto-generated code.  Do not manually edit! //
 /////////////////////////////////////////////////////////
 
-
 /**
  * A type that represents the <a href="http://www.w3.org/TR/wai-aria/roles#img">img</a>
  * role in the ARIA specification.
diff --git a/user/src/com/google/gwt/aria/client/ImgRoleImpl.java b/user/src/com/google/gwt/aria/client/ImgRoleImpl.java
index b1a2ae7..c48e6a7 100644
--- a/user/src/com/google/gwt/aria/client/ImgRoleImpl.java
+++ b/user/src/com/google/gwt/aria/client/ImgRoleImpl.java
@@ -28,272 +28,17 @@
   }
 
   @Override
-  public String getAriaAtomicProperty(Element element) {
-    return Property.ATOMIC.get(element);
-  }
-
-  @Override
-  public String getAriaBusyState(Element element) {
-    return State.BUSY.get(element);
-  }
-
-  @Override
-  public String getAriaControlsProperty(Element element) {
-    return Property.CONTROLS.get(element);
-  }
-
-  @Override
-  public String getAriaDescribedbyProperty(Element element) {
-    return Property.DESCRIBEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaDisabledState(Element element) {
-    return State.DISABLED.get(element);
-  }
-
-  @Override
-  public String getAriaDropeffectProperty(Element element) {
-    return Property.DROPEFFECT.get(element);
-  }
-
-  @Override
   public String getAriaExpandedState(Element element) {
     return State.EXPANDED.get(element);
   }
 
   @Override
-  public String getAriaFlowtoProperty(Element element) {
-    return Property.FLOWTO.get(element);
-  }
-
-  @Override
-  public String getAriaGrabbedState(Element element) {
-    return State.GRABBED.get(element);
-  }
-
-  @Override
-  public String getAriaHaspopupProperty(Element element) {
-    return Property.HASPOPUP.get(element);
-  }
-
-  @Override
-  public String getAriaHiddenState(Element element) {
-    return State.HIDDEN.get(element);
-  }
-
-  @Override
-  public String getAriaInvalidState(Element element) {
-    return State.INVALID.get(element);
-  }
-
-  @Override
-  public String getAriaLabelledbyProperty(Element element) {
-    return Property.LABELLEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaLabelProperty(Element element) {
-    return Property.LABEL.get(element);
-  }
-
-  @Override
-  public String getAriaLiveProperty(Element element) {
-    return Property.LIVE.get(element);
-  }
-
-  @Override
-  public String getAriaOwnsProperty(Element element) {
-    return Property.OWNS.get(element);
-  }
-
-  @Override
-  public String getAriaRelevantProperty(Element element) {
-    return Property.RELEVANT.get(element);
-  }
-
-  @Override
-  public String getTabindexExtraAttribute(Element element) {
-    return ExtraAttribute.TABINDEX.get(element);
-  }
-
-  @Override
-  public void removeAriaAtomicProperty(Element element) {
-    Property.ATOMIC.remove(element);
-  }
-
-  @Override
-  public void removeAriaBusyState(Element element) {
-    State.BUSY.remove(element);
-  }
-
-  @Override
-  public void removeAriaControlsProperty(Element element) {
-    Property.CONTROLS.remove(element);
-  }
-
-  @Override
-  public void removeAriaDescribedbyProperty(Element element) {
-    Property.DESCRIBEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaDisabledState(Element element) {
-    State.DISABLED.remove(element);
-  }
-
-  @Override
-  public void removeAriaDropeffectProperty(Element element) {
-    Property.DROPEFFECT.remove(element);
-  }
-
-  @Override
   public void removeAriaExpandedState(Element element) {
     State.EXPANDED.remove(element);
   }
 
   @Override
-  public void removeAriaFlowtoProperty(Element element) {
-    Property.FLOWTO.remove(element);
-  }
-
-  @Override
-  public void removeAriaGrabbedState(Element element) {
-    State.GRABBED.remove(element);
-  }
-
-  @Override
-  public void removeAriaHaspopupProperty(Element element) {
-    Property.HASPOPUP.remove(element);
-  }
-
-  @Override
-  public void removeAriaHiddenState(Element element) {
-    State.HIDDEN.remove(element);
-  }
-
-  @Override
-  public void removeAriaInvalidState(Element element) {
-    State.INVALID.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelledbyProperty(Element element) {
-    Property.LABELLEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelProperty(Element element) {
-    Property.LABEL.remove(element);
-  }
-
-  @Override
-  public void removeAriaLiveProperty(Element element) {
-    Property.LIVE.remove(element);
-  }
-
-  @Override
-  public void removeAriaOwnsProperty(Element element) {
-    Property.OWNS.remove(element);
-  }
-
-  @Override
-  public void removeAriaRelevantProperty(Element element) {
-    Property.RELEVANT.remove(element);
-  }
-
-  @Override
-  public void removeTabindexExtraAttribute(Element element) {
-    ExtraAttribute.TABINDEX.remove(element);
-  }
-
-  @Override
-  public void setAriaAtomicProperty(Element element, boolean value) {
-    Property.ATOMIC.set(element, value);
-  }
-
-  @Override
-  public void setAriaBusyState(Element element, boolean value) {
-    State.BUSY.set(element, value);
-  }
-
-  @Override
-  public void setAriaControlsProperty(Element element, IdReference... value) {
-    Property.CONTROLS.set(element, value);
-  }
-
-  @Override
-  public void setAriaDescribedbyProperty(Element element, IdReference... value) {
-    Property.DESCRIBEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaDisabledState(Element element, boolean value) {
-    State.DISABLED.set(element, value);
-  }
-
-  @Override
-  public void setAriaDropeffectProperty(Element element, DropeffectValue... value) {
-    Property.DROPEFFECT.set(element, value);
-  }
-
-  @Override
   public void setAriaExpandedState(Element element, ExpandedValue value) {
     State.EXPANDED.set(element, value);
   }
-
-  @Override
-  public void setAriaFlowtoProperty(Element element, IdReference... value) {
-    Property.FLOWTO.set(element, value);
-  }
-
-  @Override
-  public void setAriaGrabbedState(Element element, GrabbedValue value) {
-    State.GRABBED.set(element, value);
-  }
-
-  @Override
-  public void setAriaHaspopupProperty(Element element, boolean value) {
-    Property.HASPOPUP.set(element, value);
-  }
-
-  @Override
-  public void setAriaHiddenState(Element element, boolean value) {
-    State.HIDDEN.set(element, value);
-  }
-
-  @Override
-  public void setAriaInvalidState(Element element, InvalidValue value) {
-    State.INVALID.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelledbyProperty(Element element, IdReference... value) {
-    Property.LABELLEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelProperty(Element element, String value) {
-    Property.LABEL.set(element, value);
-  }
-
-  @Override
-  public void setAriaLiveProperty(Element element, LiveValue value) {
-    Property.LIVE.set(element, value);
-  }
-
-  @Override
-  public void setAriaOwnsProperty(Element element, IdReference... value) {
-    Property.OWNS.set(element, value);
-  }
-
-  @Override
-  public void setAriaRelevantProperty(Element element, RelevantValue... value) {
-    Property.RELEVANT.set(element, value);
-  }
-
-  @Override
-  public void setTabindexExtraAttribute(Element element, int value) {
-    ExtraAttribute.TABINDEX.set(element, value);
-  }
 }
diff --git a/user/src/com/google/gwt/aria/client/InputRole.java b/user/src/com/google/gwt/aria/client/InputRole.java
index 18941a4..db7dc4a 100644
--- a/user/src/com/google/gwt/aria/client/InputRole.java
+++ b/user/src/com/google/gwt/aria/client/InputRole.java
@@ -17,7 +17,6 @@
 // This is auto-generated code.  Do not manually edit! //
 /////////////////////////////////////////////////////////
 
-
 /**
  * A type that represents the <a href="http://www.w3.org/TR/wai-aria/roles#input">input</a>
  * role in the ARIA specification.
diff --git a/user/src/com/google/gwt/aria/client/LandmarkRole.java b/user/src/com/google/gwt/aria/client/LandmarkRole.java
index 70c1f9c..876a88e 100644
--- a/user/src/com/google/gwt/aria/client/LandmarkRole.java
+++ b/user/src/com/google/gwt/aria/client/LandmarkRole.java
@@ -17,7 +17,6 @@
 // This is auto-generated code.  Do not manually edit! //
 /////////////////////////////////////////////////////////
 
-
 /**
  * A type that represents the <a href="http://www.w3.org/TR/wai-aria/roles#landmark">landmark</a>
  * role in the ARIA specification.
diff --git a/user/src/com/google/gwt/aria/client/LinkRoleImpl.java b/user/src/com/google/gwt/aria/client/LinkRoleImpl.java
index 92f161d..83d1ce1 100644
--- a/user/src/com/google/gwt/aria/client/LinkRoleImpl.java
+++ b/user/src/com/google/gwt/aria/client/LinkRoleImpl.java
@@ -28,272 +28,17 @@
   }
 
   @Override
-  public String getAriaAtomicProperty(Element element) {
-    return Property.ATOMIC.get(element);
-  }
-
-  @Override
-  public String getAriaBusyState(Element element) {
-    return State.BUSY.get(element);
-  }
-
-  @Override
-  public String getAriaControlsProperty(Element element) {
-    return Property.CONTROLS.get(element);
-  }
-
-  @Override
-  public String getAriaDescribedbyProperty(Element element) {
-    return Property.DESCRIBEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaDisabledState(Element element) {
-    return State.DISABLED.get(element);
-  }
-
-  @Override
-  public String getAriaDropeffectProperty(Element element) {
-    return Property.DROPEFFECT.get(element);
-  }
-
-  @Override
   public String getAriaExpandedState(Element element) {
     return State.EXPANDED.get(element);
   }
 
   @Override
-  public String getAriaFlowtoProperty(Element element) {
-    return Property.FLOWTO.get(element);
-  }
-
-  @Override
-  public String getAriaGrabbedState(Element element) {
-    return State.GRABBED.get(element);
-  }
-
-  @Override
-  public String getAriaHaspopupProperty(Element element) {
-    return Property.HASPOPUP.get(element);
-  }
-
-  @Override
-  public String getAriaHiddenState(Element element) {
-    return State.HIDDEN.get(element);
-  }
-
-  @Override
-  public String getAriaInvalidState(Element element) {
-    return State.INVALID.get(element);
-  }
-
-  @Override
-  public String getAriaLabelledbyProperty(Element element) {
-    return Property.LABELLEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaLabelProperty(Element element) {
-    return Property.LABEL.get(element);
-  }
-
-  @Override
-  public String getAriaLiveProperty(Element element) {
-    return Property.LIVE.get(element);
-  }
-
-  @Override
-  public String getAriaOwnsProperty(Element element) {
-    return Property.OWNS.get(element);
-  }
-
-  @Override
-  public String getAriaRelevantProperty(Element element) {
-    return Property.RELEVANT.get(element);
-  }
-
-  @Override
-  public String getTabindexExtraAttribute(Element element) {
-    return ExtraAttribute.TABINDEX.get(element);
-  }
-
-  @Override
-  public void removeAriaAtomicProperty(Element element) {
-    Property.ATOMIC.remove(element);
-  }
-
-  @Override
-  public void removeAriaBusyState(Element element) {
-    State.BUSY.remove(element);
-  }
-
-  @Override
-  public void removeAriaControlsProperty(Element element) {
-    Property.CONTROLS.remove(element);
-  }
-
-  @Override
-  public void removeAriaDescribedbyProperty(Element element) {
-    Property.DESCRIBEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaDisabledState(Element element) {
-    State.DISABLED.remove(element);
-  }
-
-  @Override
-  public void removeAriaDropeffectProperty(Element element) {
-    Property.DROPEFFECT.remove(element);
-  }
-
-  @Override
   public void removeAriaExpandedState(Element element) {
     State.EXPANDED.remove(element);
   }
 
   @Override
-  public void removeAriaFlowtoProperty(Element element) {
-    Property.FLOWTO.remove(element);
-  }
-
-  @Override
-  public void removeAriaGrabbedState(Element element) {
-    State.GRABBED.remove(element);
-  }
-
-  @Override
-  public void removeAriaHaspopupProperty(Element element) {
-    Property.HASPOPUP.remove(element);
-  }
-
-  @Override
-  public void removeAriaHiddenState(Element element) {
-    State.HIDDEN.remove(element);
-  }
-
-  @Override
-  public void removeAriaInvalidState(Element element) {
-    State.INVALID.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelledbyProperty(Element element) {
-    Property.LABELLEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelProperty(Element element) {
-    Property.LABEL.remove(element);
-  }
-
-  @Override
-  public void removeAriaLiveProperty(Element element) {
-    Property.LIVE.remove(element);
-  }
-
-  @Override
-  public void removeAriaOwnsProperty(Element element) {
-    Property.OWNS.remove(element);
-  }
-
-  @Override
-  public void removeAriaRelevantProperty(Element element) {
-    Property.RELEVANT.remove(element);
-  }
-
-  @Override
-  public void removeTabindexExtraAttribute(Element element) {
-    ExtraAttribute.TABINDEX.remove(element);
-  }
-
-  @Override
-  public void setAriaAtomicProperty(Element element, boolean value) {
-    Property.ATOMIC.set(element, value);
-  }
-
-  @Override
-  public void setAriaBusyState(Element element, boolean value) {
-    State.BUSY.set(element, value);
-  }
-
-  @Override
-  public void setAriaControlsProperty(Element element, IdReference... value) {
-    Property.CONTROLS.set(element, value);
-  }
-
-  @Override
-  public void setAriaDescribedbyProperty(Element element, IdReference... value) {
-    Property.DESCRIBEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaDisabledState(Element element, boolean value) {
-    State.DISABLED.set(element, value);
-  }
-
-  @Override
-  public void setAriaDropeffectProperty(Element element, DropeffectValue... value) {
-    Property.DROPEFFECT.set(element, value);
-  }
-
-  @Override
   public void setAriaExpandedState(Element element, ExpandedValue value) {
     State.EXPANDED.set(element, value);
   }
-
-  @Override
-  public void setAriaFlowtoProperty(Element element, IdReference... value) {
-    Property.FLOWTO.set(element, value);
-  }
-
-  @Override
-  public void setAriaGrabbedState(Element element, GrabbedValue value) {
-    State.GRABBED.set(element, value);
-  }
-
-  @Override
-  public void setAriaHaspopupProperty(Element element, boolean value) {
-    Property.HASPOPUP.set(element, value);
-  }
-
-  @Override
-  public void setAriaHiddenState(Element element, boolean value) {
-    State.HIDDEN.set(element, value);
-  }
-
-  @Override
-  public void setAriaInvalidState(Element element, InvalidValue value) {
-    State.INVALID.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelledbyProperty(Element element, IdReference... value) {
-    Property.LABELLEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelProperty(Element element, String value) {
-    Property.LABEL.set(element, value);
-  }
-
-  @Override
-  public void setAriaLiveProperty(Element element, LiveValue value) {
-    Property.LIVE.set(element, value);
-  }
-
-  @Override
-  public void setAriaOwnsProperty(Element element, IdReference... value) {
-    Property.OWNS.set(element, value);
-  }
-
-  @Override
-  public void setAriaRelevantProperty(Element element, RelevantValue... value) {
-    Property.RELEVANT.set(element, value);
-  }
-
-  @Override
-  public void setTabindexExtraAttribute(Element element, int value) {
-    ExtraAttribute.TABINDEX.set(element, value);
-  }
 }
diff --git a/user/src/com/google/gwt/aria/client/ListRole.java b/user/src/com/google/gwt/aria/client/ListRole.java
index ac37031..addf7fb 100644
--- a/user/src/com/google/gwt/aria/client/ListRole.java
+++ b/user/src/com/google/gwt/aria/client/ListRole.java
@@ -17,7 +17,6 @@
 // This is auto-generated code.  Do not manually edit! //
 /////////////////////////////////////////////////////////
 
-
 /**
  * A type that represents the <a href="http://www.w3.org/TR/wai-aria/roles#list">list</a>
  * role in the ARIA specification.
diff --git a/user/src/com/google/gwt/aria/client/ListRoleImpl.java b/user/src/com/google/gwt/aria/client/ListRoleImpl.java
index 05d420d..8860d2b 100644
--- a/user/src/com/google/gwt/aria/client/ListRoleImpl.java
+++ b/user/src/com/google/gwt/aria/client/ListRoleImpl.java
@@ -28,272 +28,17 @@
   }
 
   @Override
-  public String getAriaAtomicProperty(Element element) {
-    return Property.ATOMIC.get(element);
-  }
-
-  @Override
-  public String getAriaBusyState(Element element) {
-    return State.BUSY.get(element);
-  }
-
-  @Override
-  public String getAriaControlsProperty(Element element) {
-    return Property.CONTROLS.get(element);
-  }
-
-  @Override
-  public String getAriaDescribedbyProperty(Element element) {
-    return Property.DESCRIBEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaDisabledState(Element element) {
-    return State.DISABLED.get(element);
-  }
-
-  @Override
-  public String getAriaDropeffectProperty(Element element) {
-    return Property.DROPEFFECT.get(element);
-  }
-
-  @Override
   public String getAriaExpandedState(Element element) {
     return State.EXPANDED.get(element);
   }
 
   @Override
-  public String getAriaFlowtoProperty(Element element) {
-    return Property.FLOWTO.get(element);
-  }
-
-  @Override
-  public String getAriaGrabbedState(Element element) {
-    return State.GRABBED.get(element);
-  }
-
-  @Override
-  public String getAriaHaspopupProperty(Element element) {
-    return Property.HASPOPUP.get(element);
-  }
-
-  @Override
-  public String getAriaHiddenState(Element element) {
-    return State.HIDDEN.get(element);
-  }
-
-  @Override
-  public String getAriaInvalidState(Element element) {
-    return State.INVALID.get(element);
-  }
-
-  @Override
-  public String getAriaLabelledbyProperty(Element element) {
-    return Property.LABELLEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaLabelProperty(Element element) {
-    return Property.LABEL.get(element);
-  }
-
-  @Override
-  public String getAriaLiveProperty(Element element) {
-    return Property.LIVE.get(element);
-  }
-
-  @Override
-  public String getAriaOwnsProperty(Element element) {
-    return Property.OWNS.get(element);
-  }
-
-  @Override
-  public String getAriaRelevantProperty(Element element) {
-    return Property.RELEVANT.get(element);
-  }
-
-  @Override
-  public String getTabindexExtraAttribute(Element element) {
-    return ExtraAttribute.TABINDEX.get(element);
-  }
-
-  @Override
-  public void removeAriaAtomicProperty(Element element) {
-    Property.ATOMIC.remove(element);
-  }
-
-  @Override
-  public void removeAriaBusyState(Element element) {
-    State.BUSY.remove(element);
-  }
-
-  @Override
-  public void removeAriaControlsProperty(Element element) {
-    Property.CONTROLS.remove(element);
-  }
-
-  @Override
-  public void removeAriaDescribedbyProperty(Element element) {
-    Property.DESCRIBEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaDisabledState(Element element) {
-    State.DISABLED.remove(element);
-  }
-
-  @Override
-  public void removeAriaDropeffectProperty(Element element) {
-    Property.DROPEFFECT.remove(element);
-  }
-
-  @Override
   public void removeAriaExpandedState(Element element) {
     State.EXPANDED.remove(element);
   }
 
   @Override
-  public void removeAriaFlowtoProperty(Element element) {
-    Property.FLOWTO.remove(element);
-  }
-
-  @Override
-  public void removeAriaGrabbedState(Element element) {
-    State.GRABBED.remove(element);
-  }
-
-  @Override
-  public void removeAriaHaspopupProperty(Element element) {
-    Property.HASPOPUP.remove(element);
-  }
-
-  @Override
-  public void removeAriaHiddenState(Element element) {
-    State.HIDDEN.remove(element);
-  }
-
-  @Override
-  public void removeAriaInvalidState(Element element) {
-    State.INVALID.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelledbyProperty(Element element) {
-    Property.LABELLEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelProperty(Element element) {
-    Property.LABEL.remove(element);
-  }
-
-  @Override
-  public void removeAriaLiveProperty(Element element) {
-    Property.LIVE.remove(element);
-  }
-
-  @Override
-  public void removeAriaOwnsProperty(Element element) {
-    Property.OWNS.remove(element);
-  }
-
-  @Override
-  public void removeAriaRelevantProperty(Element element) {
-    Property.RELEVANT.remove(element);
-  }
-
-  @Override
-  public void removeTabindexExtraAttribute(Element element) {
-    ExtraAttribute.TABINDEX.remove(element);
-  }
-
-  @Override
-  public void setAriaAtomicProperty(Element element, boolean value) {
-    Property.ATOMIC.set(element, value);
-  }
-
-  @Override
-  public void setAriaBusyState(Element element, boolean value) {
-    State.BUSY.set(element, value);
-  }
-
-  @Override
-  public void setAriaControlsProperty(Element element, IdReference... value) {
-    Property.CONTROLS.set(element, value);
-  }
-
-  @Override
-  public void setAriaDescribedbyProperty(Element element, IdReference... value) {
-    Property.DESCRIBEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaDisabledState(Element element, boolean value) {
-    State.DISABLED.set(element, value);
-  }
-
-  @Override
-  public void setAriaDropeffectProperty(Element element, DropeffectValue... value) {
-    Property.DROPEFFECT.set(element, value);
-  }
-
-  @Override
   public void setAriaExpandedState(Element element, ExpandedValue value) {
     State.EXPANDED.set(element, value);
   }
-
-  @Override
-  public void setAriaFlowtoProperty(Element element, IdReference... value) {
-    Property.FLOWTO.set(element, value);
-  }
-
-  @Override
-  public void setAriaGrabbedState(Element element, GrabbedValue value) {
-    State.GRABBED.set(element, value);
-  }
-
-  @Override
-  public void setAriaHaspopupProperty(Element element, boolean value) {
-    Property.HASPOPUP.set(element, value);
-  }
-
-  @Override
-  public void setAriaHiddenState(Element element, boolean value) {
-    State.HIDDEN.set(element, value);
-  }
-
-  @Override
-  public void setAriaInvalidState(Element element, InvalidValue value) {
-    State.INVALID.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelledbyProperty(Element element, IdReference... value) {
-    Property.LABELLEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelProperty(Element element, String value) {
-    Property.LABEL.set(element, value);
-  }
-
-  @Override
-  public void setAriaLiveProperty(Element element, LiveValue value) {
-    Property.LIVE.set(element, value);
-  }
-
-  @Override
-  public void setAriaOwnsProperty(Element element, IdReference... value) {
-    Property.OWNS.set(element, value);
-  }
-
-  @Override
-  public void setAriaRelevantProperty(Element element, RelevantValue... value) {
-    Property.RELEVANT.set(element, value);
-  }
-
-  @Override
-  public void setTabindexExtraAttribute(Element element, int value) {
-    ExtraAttribute.TABINDEX.set(element, value);
-  }
 }
diff --git a/user/src/com/google/gwt/aria/client/ListboxRoleImpl.java b/user/src/com/google/gwt/aria/client/ListboxRoleImpl.java
index 9856ad0..f1f339f 100644
--- a/user/src/com/google/gwt/aria/client/ListboxRoleImpl.java
+++ b/user/src/com/google/gwt/aria/client/ListboxRoleImpl.java
@@ -33,312 +33,57 @@
   }
 
   @Override
-  public String getAriaAtomicProperty(Element element) {
-    return Property.ATOMIC.get(element);
-  }
-
-  @Override
-  public String getAriaBusyState(Element element) {
-    return State.BUSY.get(element);
-  }
-
-  @Override
-  public String getAriaControlsProperty(Element element) {
-    return Property.CONTROLS.get(element);
-  }
-
-  @Override
-  public String getAriaDescribedbyProperty(Element element) {
-    return Property.DESCRIBEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaDisabledState(Element element) {
-    return State.DISABLED.get(element);
-  }
-
-  @Override
-  public String getAriaDropeffectProperty(Element element) {
-    return Property.DROPEFFECT.get(element);
-  }
-
-  @Override
   public String getAriaExpandedState(Element element) {
     return State.EXPANDED.get(element);
   }
 
   @Override
-  public String getAriaFlowtoProperty(Element element) {
-    return Property.FLOWTO.get(element);
-  }
-
-  @Override
-  public String getAriaGrabbedState(Element element) {
-    return State.GRABBED.get(element);
-  }
-
-  @Override
-  public String getAriaHaspopupProperty(Element element) {
-    return Property.HASPOPUP.get(element);
-  }
-
-  @Override
-  public String getAriaHiddenState(Element element) {
-    return State.HIDDEN.get(element);
-  }
-
-  @Override
-  public String getAriaInvalidState(Element element) {
-    return State.INVALID.get(element);
-  }
-
-  @Override
-  public String getAriaLabelledbyProperty(Element element) {
-    return Property.LABELLEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaLabelProperty(Element element) {
-    return Property.LABEL.get(element);
-  }
-
-  @Override
-  public String getAriaLiveProperty(Element element) {
-    return Property.LIVE.get(element);
-  }
-
-  @Override
   public String getAriaMultiselectableProperty(Element element) {
     return Property.MULTISELECTABLE.get(element);
   }
 
   @Override
-  public String getAriaOwnsProperty(Element element) {
-    return Property.OWNS.get(element);
-  }
-
-  @Override
-  public String getAriaRelevantProperty(Element element) {
-    return Property.RELEVANT.get(element);
-  }
-
-  @Override
   public String getAriaRequiredProperty(Element element) {
     return Property.REQUIRED.get(element);
   }
 
   @Override
-  public String getTabindexExtraAttribute(Element element) {
-    return ExtraAttribute.TABINDEX.get(element);
-  }
-
-  @Override
   public void removeAriaActivedescendantProperty(Element element) {
     Property.ACTIVEDESCENDANT.remove(element);
   }
 
   @Override
-  public void removeAriaAtomicProperty(Element element) {
-    Property.ATOMIC.remove(element);
-  }
-
-  @Override
-  public void removeAriaBusyState(Element element) {
-    State.BUSY.remove(element);
-  }
-
-  @Override
-  public void removeAriaControlsProperty(Element element) {
-    Property.CONTROLS.remove(element);
-  }
-
-  @Override
-  public void removeAriaDescribedbyProperty(Element element) {
-    Property.DESCRIBEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaDisabledState(Element element) {
-    State.DISABLED.remove(element);
-  }
-
-  @Override
-  public void removeAriaDropeffectProperty(Element element) {
-    Property.DROPEFFECT.remove(element);
-  }
-
-  @Override
   public void removeAriaExpandedState(Element element) {
     State.EXPANDED.remove(element);
   }
 
   @Override
-  public void removeAriaFlowtoProperty(Element element) {
-    Property.FLOWTO.remove(element);
-  }
-
-  @Override
-  public void removeAriaGrabbedState(Element element) {
-    State.GRABBED.remove(element);
-  }
-
-  @Override
-  public void removeAriaHaspopupProperty(Element element) {
-    Property.HASPOPUP.remove(element);
-  }
-
-  @Override
-  public void removeAriaHiddenState(Element element) {
-    State.HIDDEN.remove(element);
-  }
-
-  @Override
-  public void removeAriaInvalidState(Element element) {
-    State.INVALID.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelledbyProperty(Element element) {
-    Property.LABELLEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelProperty(Element element) {
-    Property.LABEL.remove(element);
-  }
-
-  @Override
-  public void removeAriaLiveProperty(Element element) {
-    Property.LIVE.remove(element);
-  }
-
-  @Override
   public void removeAriaMultiselectableProperty(Element element) {
     Property.MULTISELECTABLE.remove(element);
   }
 
   @Override
-  public void removeAriaOwnsProperty(Element element) {
-    Property.OWNS.remove(element);
-  }
-
-  @Override
-  public void removeAriaRelevantProperty(Element element) {
-    Property.RELEVANT.remove(element);
-  }
-
-  @Override
   public void removeAriaRequiredProperty(Element element) {
     Property.REQUIRED.remove(element);
   }
 
   @Override
-  public void removeTabindexExtraAttribute(Element element) {
-    ExtraAttribute.TABINDEX.remove(element);
-  }
-
-  @Override
   public void setAriaActivedescendantProperty(Element element, IdReference value) {
     Property.ACTIVEDESCENDANT.set(element, value);
   }
 
   @Override
-  public void setAriaAtomicProperty(Element element, boolean value) {
-    Property.ATOMIC.set(element, value);
-  }
-
-  @Override
-  public void setAriaBusyState(Element element, boolean value) {
-    State.BUSY.set(element, value);
-  }
-
-  @Override
-  public void setAriaControlsProperty(Element element, IdReference... value) {
-    Property.CONTROLS.set(element, value);
-  }
-
-  @Override
-  public void setAriaDescribedbyProperty(Element element, IdReference... value) {
-    Property.DESCRIBEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaDisabledState(Element element, boolean value) {
-    State.DISABLED.set(element, value);
-  }
-
-  @Override
-  public void setAriaDropeffectProperty(Element element, DropeffectValue... value) {
-    Property.DROPEFFECT.set(element, value);
-  }
-
-  @Override
   public void setAriaExpandedState(Element element, ExpandedValue value) {
     State.EXPANDED.set(element, value);
   }
 
   @Override
-  public void setAriaFlowtoProperty(Element element, IdReference... value) {
-    Property.FLOWTO.set(element, value);
-  }
-
-  @Override
-  public void setAriaGrabbedState(Element element, GrabbedValue value) {
-    State.GRABBED.set(element, value);
-  }
-
-  @Override
-  public void setAriaHaspopupProperty(Element element, boolean value) {
-    Property.HASPOPUP.set(element, value);
-  }
-
-  @Override
-  public void setAriaHiddenState(Element element, boolean value) {
-    State.HIDDEN.set(element, value);
-  }
-
-  @Override
-  public void setAriaInvalidState(Element element, InvalidValue value) {
-    State.INVALID.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelledbyProperty(Element element, IdReference... value) {
-    Property.LABELLEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelProperty(Element element, String value) {
-    Property.LABEL.set(element, value);
-  }
-
-  @Override
-  public void setAriaLiveProperty(Element element, LiveValue value) {
-    Property.LIVE.set(element, value);
-  }
-
-  @Override
   public void setAriaMultiselectableProperty(Element element, boolean value) {
     Property.MULTISELECTABLE.set(element, value);
   }
 
   @Override
-  public void setAriaOwnsProperty(Element element, IdReference... value) {
-    Property.OWNS.set(element, value);
-  }
-
-  @Override
-  public void setAriaRelevantProperty(Element element, RelevantValue... value) {
-    Property.RELEVANT.set(element, value);
-  }
-
-  @Override
   public void setAriaRequiredProperty(Element element, boolean value) {
     Property.REQUIRED.set(element, value);
   }
-
-  @Override
-  public void setTabindexExtraAttribute(Element element, int value) {
-    ExtraAttribute.TABINDEX.set(element, value);
-  }
 }
diff --git a/user/src/com/google/gwt/aria/client/ListitemRoleImpl.java b/user/src/com/google/gwt/aria/client/ListitemRoleImpl.java
index 07be0c4..c85c759 100644
--- a/user/src/com/google/gwt/aria/client/ListitemRoleImpl.java
+++ b/user/src/com/google/gwt/aria/client/ListitemRoleImpl.java
@@ -28,317 +28,62 @@
   }
 
   @Override
-  public String getAriaAtomicProperty(Element element) {
-    return Property.ATOMIC.get(element);
-  }
-
-  @Override
-  public String getAriaBusyState(Element element) {
-    return State.BUSY.get(element);
-  }
-
-  @Override
-  public String getAriaControlsProperty(Element element) {
-    return Property.CONTROLS.get(element);
-  }
-
-  @Override
-  public String getAriaDescribedbyProperty(Element element) {
-    return Property.DESCRIBEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaDisabledState(Element element) {
-    return State.DISABLED.get(element);
-  }
-
-  @Override
-  public String getAriaDropeffectProperty(Element element) {
-    return Property.DROPEFFECT.get(element);
-  }
-
-  @Override
   public String getAriaExpandedState(Element element) {
     return State.EXPANDED.get(element);
   }
 
   @Override
-  public String getAriaFlowtoProperty(Element element) {
-    return Property.FLOWTO.get(element);
-  }
-
-  @Override
-  public String getAriaGrabbedState(Element element) {
-    return State.GRABBED.get(element);
-  }
-
-  @Override
-  public String getAriaHaspopupProperty(Element element) {
-    return Property.HASPOPUP.get(element);
-  }
-
-  @Override
-  public String getAriaHiddenState(Element element) {
-    return State.HIDDEN.get(element);
-  }
-
-  @Override
-  public String getAriaInvalidState(Element element) {
-    return State.INVALID.get(element);
-  }
-
-  @Override
-  public String getAriaLabelledbyProperty(Element element) {
-    return Property.LABELLEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaLabelProperty(Element element) {
-    return Property.LABEL.get(element);
-  }
-
-  @Override
   public String getAriaLevelProperty(Element element) {
     return Property.LEVEL.get(element);
   }
 
   @Override
-  public String getAriaLiveProperty(Element element) {
-    return Property.LIVE.get(element);
-  }
-
-  @Override
-  public String getAriaOwnsProperty(Element element) {
-    return Property.OWNS.get(element);
-  }
-
-  @Override
   public String getAriaPosinsetProperty(Element element) {
     return Property.POSINSET.get(element);
   }
 
   @Override
-  public String getAriaRelevantProperty(Element element) {
-    return Property.RELEVANT.get(element);
-  }
-
-  @Override
   public String getAriaSetsizeProperty(Element element) {
     return Property.SETSIZE.get(element);
   }
 
   @Override
-  public String getTabindexExtraAttribute(Element element) {
-    return ExtraAttribute.TABINDEX.get(element);
-  }
-
-  @Override
-  public void removeAriaAtomicProperty(Element element) {
-    Property.ATOMIC.remove(element);
-  }
-
-  @Override
-  public void removeAriaBusyState(Element element) {
-    State.BUSY.remove(element);
-  }
-
-  @Override
-  public void removeAriaControlsProperty(Element element) {
-    Property.CONTROLS.remove(element);
-  }
-
-  @Override
-  public void removeAriaDescribedbyProperty(Element element) {
-    Property.DESCRIBEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaDisabledState(Element element) {
-    State.DISABLED.remove(element);
-  }
-
-  @Override
-  public void removeAriaDropeffectProperty(Element element) {
-    Property.DROPEFFECT.remove(element);
-  }
-
-  @Override
   public void removeAriaExpandedState(Element element) {
     State.EXPANDED.remove(element);
   }
 
   @Override
-  public void removeAriaFlowtoProperty(Element element) {
-    Property.FLOWTO.remove(element);
-  }
-
-  @Override
-  public void removeAriaGrabbedState(Element element) {
-    State.GRABBED.remove(element);
-  }
-
-  @Override
-  public void removeAriaHaspopupProperty(Element element) {
-    Property.HASPOPUP.remove(element);
-  }
-
-  @Override
-  public void removeAriaHiddenState(Element element) {
-    State.HIDDEN.remove(element);
-  }
-
-  @Override
-  public void removeAriaInvalidState(Element element) {
-    State.INVALID.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelledbyProperty(Element element) {
-    Property.LABELLEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelProperty(Element element) {
-    Property.LABEL.remove(element);
-  }
-
-  @Override
   public void removeAriaLevelProperty(Element element) {
     Property.LEVEL.remove(element);
   }
 
   @Override
-  public void removeAriaLiveProperty(Element element) {
-    Property.LIVE.remove(element);
-  }
-
-  @Override
-  public void removeAriaOwnsProperty(Element element) {
-    Property.OWNS.remove(element);
-  }
-
-  @Override
   public void removeAriaPosinsetProperty(Element element) {
     Property.POSINSET.remove(element);
   }
 
   @Override
-  public void removeAriaRelevantProperty(Element element) {
-    Property.RELEVANT.remove(element);
-  }
-
-  @Override
   public void removeAriaSetsizeProperty(Element element) {
     Property.SETSIZE.remove(element);
   }
 
   @Override
-  public void removeTabindexExtraAttribute(Element element) {
-    ExtraAttribute.TABINDEX.remove(element);
-  }
-
-  @Override
-  public void setAriaAtomicProperty(Element element, boolean value) {
-    Property.ATOMIC.set(element, value);
-  }
-
-  @Override
-  public void setAriaBusyState(Element element, boolean value) {
-    State.BUSY.set(element, value);
-  }
-
-  @Override
-  public void setAriaControlsProperty(Element element, IdReference... value) {
-    Property.CONTROLS.set(element, value);
-  }
-
-  @Override
-  public void setAriaDescribedbyProperty(Element element, IdReference... value) {
-    Property.DESCRIBEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaDisabledState(Element element, boolean value) {
-    State.DISABLED.set(element, value);
-  }
-
-  @Override
-  public void setAriaDropeffectProperty(Element element, DropeffectValue... value) {
-    Property.DROPEFFECT.set(element, value);
-  }
-
-  @Override
   public void setAriaExpandedState(Element element, ExpandedValue value) {
     State.EXPANDED.set(element, value);
   }
 
   @Override
-  public void setAriaFlowtoProperty(Element element, IdReference... value) {
-    Property.FLOWTO.set(element, value);
-  }
-
-  @Override
-  public void setAriaGrabbedState(Element element, GrabbedValue value) {
-    State.GRABBED.set(element, value);
-  }
-
-  @Override
-  public void setAriaHaspopupProperty(Element element, boolean value) {
-    Property.HASPOPUP.set(element, value);
-  }
-
-  @Override
-  public void setAriaHiddenState(Element element, boolean value) {
-    State.HIDDEN.set(element, value);
-  }
-
-  @Override
-  public void setAriaInvalidState(Element element, InvalidValue value) {
-    State.INVALID.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelledbyProperty(Element element, IdReference... value) {
-    Property.LABELLEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelProperty(Element element, String value) {
-    Property.LABEL.set(element, value);
-  }
-
-  @Override
   public void setAriaLevelProperty(Element element, int value) {
     Property.LEVEL.set(element, value);
   }
 
   @Override
-  public void setAriaLiveProperty(Element element, LiveValue value) {
-    Property.LIVE.set(element, value);
-  }
-
-  @Override
-  public void setAriaOwnsProperty(Element element, IdReference... value) {
-    Property.OWNS.set(element, value);
-  }
-
-  @Override
   public void setAriaPosinsetProperty(Element element, int value) {
     Property.POSINSET.set(element, value);
   }
 
   @Override
-  public void setAriaRelevantProperty(Element element, RelevantValue... value) {
-    Property.RELEVANT.set(element, value);
-  }
-
-  @Override
   public void setAriaSetsizeProperty(Element element, int value) {
     Property.SETSIZE.set(element, value);
   }
-
-  @Override
-  public void setTabindexExtraAttribute(Element element, int value) {
-    ExtraAttribute.TABINDEX.set(element, value);
-  }
 }
diff --git a/user/src/com/google/gwt/aria/client/LogRole.java b/user/src/com/google/gwt/aria/client/LogRole.java
index 4c8c19f..243a7bb 100644
--- a/user/src/com/google/gwt/aria/client/LogRole.java
+++ b/user/src/com/google/gwt/aria/client/LogRole.java
@@ -17,7 +17,6 @@
 // This is auto-generated code.  Do not manually edit! //
 /////////////////////////////////////////////////////////
 
-
 /**
  * A type that represents the <a href="http://www.w3.org/TR/wai-aria/roles#log">log</a>
  * role in the ARIA specification.
diff --git a/user/src/com/google/gwt/aria/client/LogRoleImpl.java b/user/src/com/google/gwt/aria/client/LogRoleImpl.java
index 1901e5e..f6b8c3d 100644
--- a/user/src/com/google/gwt/aria/client/LogRoleImpl.java
+++ b/user/src/com/google/gwt/aria/client/LogRoleImpl.java
@@ -28,272 +28,17 @@
   }
 
   @Override
-  public String getAriaAtomicProperty(Element element) {
-    return Property.ATOMIC.get(element);
-  }
-
-  @Override
-  public String getAriaBusyState(Element element) {
-    return State.BUSY.get(element);
-  }
-
-  @Override
-  public String getAriaControlsProperty(Element element) {
-    return Property.CONTROLS.get(element);
-  }
-
-  @Override
-  public String getAriaDescribedbyProperty(Element element) {
-    return Property.DESCRIBEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaDisabledState(Element element) {
-    return State.DISABLED.get(element);
-  }
-
-  @Override
-  public String getAriaDropeffectProperty(Element element) {
-    return Property.DROPEFFECT.get(element);
-  }
-
-  @Override
   public String getAriaExpandedState(Element element) {
     return State.EXPANDED.get(element);
   }
 
   @Override
-  public String getAriaFlowtoProperty(Element element) {
-    return Property.FLOWTO.get(element);
-  }
-
-  @Override
-  public String getAriaGrabbedState(Element element) {
-    return State.GRABBED.get(element);
-  }
-
-  @Override
-  public String getAriaHaspopupProperty(Element element) {
-    return Property.HASPOPUP.get(element);
-  }
-
-  @Override
-  public String getAriaHiddenState(Element element) {
-    return State.HIDDEN.get(element);
-  }
-
-  @Override
-  public String getAriaInvalidState(Element element) {
-    return State.INVALID.get(element);
-  }
-
-  @Override
-  public String getAriaLabelledbyProperty(Element element) {
-    return Property.LABELLEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaLabelProperty(Element element) {
-    return Property.LABEL.get(element);
-  }
-
-  @Override
-  public String getAriaLiveProperty(Element element) {
-    return Property.LIVE.get(element);
-  }
-
-  @Override
-  public String getAriaOwnsProperty(Element element) {
-    return Property.OWNS.get(element);
-  }
-
-  @Override
-  public String getAriaRelevantProperty(Element element) {
-    return Property.RELEVANT.get(element);
-  }
-
-  @Override
-  public String getTabindexExtraAttribute(Element element) {
-    return ExtraAttribute.TABINDEX.get(element);
-  }
-
-  @Override
-  public void removeAriaAtomicProperty(Element element) {
-    Property.ATOMIC.remove(element);
-  }
-
-  @Override
-  public void removeAriaBusyState(Element element) {
-    State.BUSY.remove(element);
-  }
-
-  @Override
-  public void removeAriaControlsProperty(Element element) {
-    Property.CONTROLS.remove(element);
-  }
-
-  @Override
-  public void removeAriaDescribedbyProperty(Element element) {
-    Property.DESCRIBEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaDisabledState(Element element) {
-    State.DISABLED.remove(element);
-  }
-
-  @Override
-  public void removeAriaDropeffectProperty(Element element) {
-    Property.DROPEFFECT.remove(element);
-  }
-
-  @Override
   public void removeAriaExpandedState(Element element) {
     State.EXPANDED.remove(element);
   }
 
   @Override
-  public void removeAriaFlowtoProperty(Element element) {
-    Property.FLOWTO.remove(element);
-  }
-
-  @Override
-  public void removeAriaGrabbedState(Element element) {
-    State.GRABBED.remove(element);
-  }
-
-  @Override
-  public void removeAriaHaspopupProperty(Element element) {
-    Property.HASPOPUP.remove(element);
-  }
-
-  @Override
-  public void removeAriaHiddenState(Element element) {
-    State.HIDDEN.remove(element);
-  }
-
-  @Override
-  public void removeAriaInvalidState(Element element) {
-    State.INVALID.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelledbyProperty(Element element) {
-    Property.LABELLEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelProperty(Element element) {
-    Property.LABEL.remove(element);
-  }
-
-  @Override
-  public void removeAriaLiveProperty(Element element) {
-    Property.LIVE.remove(element);
-  }
-
-  @Override
-  public void removeAriaOwnsProperty(Element element) {
-    Property.OWNS.remove(element);
-  }
-
-  @Override
-  public void removeAriaRelevantProperty(Element element) {
-    Property.RELEVANT.remove(element);
-  }
-
-  @Override
-  public void removeTabindexExtraAttribute(Element element) {
-    ExtraAttribute.TABINDEX.remove(element);
-  }
-
-  @Override
-  public void setAriaAtomicProperty(Element element, boolean value) {
-    Property.ATOMIC.set(element, value);
-  }
-
-  @Override
-  public void setAriaBusyState(Element element, boolean value) {
-    State.BUSY.set(element, value);
-  }
-
-  @Override
-  public void setAriaControlsProperty(Element element, IdReference... value) {
-    Property.CONTROLS.set(element, value);
-  }
-
-  @Override
-  public void setAriaDescribedbyProperty(Element element, IdReference... value) {
-    Property.DESCRIBEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaDisabledState(Element element, boolean value) {
-    State.DISABLED.set(element, value);
-  }
-
-  @Override
-  public void setAriaDropeffectProperty(Element element, DropeffectValue... value) {
-    Property.DROPEFFECT.set(element, value);
-  }
-
-  @Override
   public void setAriaExpandedState(Element element, ExpandedValue value) {
     State.EXPANDED.set(element, value);
   }
-
-  @Override
-  public void setAriaFlowtoProperty(Element element, IdReference... value) {
-    Property.FLOWTO.set(element, value);
-  }
-
-  @Override
-  public void setAriaGrabbedState(Element element, GrabbedValue value) {
-    State.GRABBED.set(element, value);
-  }
-
-  @Override
-  public void setAriaHaspopupProperty(Element element, boolean value) {
-    Property.HASPOPUP.set(element, value);
-  }
-
-  @Override
-  public void setAriaHiddenState(Element element, boolean value) {
-    State.HIDDEN.set(element, value);
-  }
-
-  @Override
-  public void setAriaInvalidState(Element element, InvalidValue value) {
-    State.INVALID.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelledbyProperty(Element element, IdReference... value) {
-    Property.LABELLEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelProperty(Element element, String value) {
-    Property.LABEL.set(element, value);
-  }
-
-  @Override
-  public void setAriaLiveProperty(Element element, LiveValue value) {
-    Property.LIVE.set(element, value);
-  }
-
-  @Override
-  public void setAriaOwnsProperty(Element element, IdReference... value) {
-    Property.OWNS.set(element, value);
-  }
-
-  @Override
-  public void setAriaRelevantProperty(Element element, RelevantValue... value) {
-    Property.RELEVANT.set(element, value);
-  }
-
-  @Override
-  public void setTabindexExtraAttribute(Element element, int value) {
-    ExtraAttribute.TABINDEX.set(element, value);
-  }
 }
diff --git a/user/src/com/google/gwt/aria/client/MainRole.java b/user/src/com/google/gwt/aria/client/MainRole.java
index a54e514..33eee23 100644
--- a/user/src/com/google/gwt/aria/client/MainRole.java
+++ b/user/src/com/google/gwt/aria/client/MainRole.java
@@ -17,7 +17,6 @@
 // This is auto-generated code.  Do not manually edit! //
 /////////////////////////////////////////////////////////
 
-
 /**
  * A type that represents the <a href="http://www.w3.org/TR/wai-aria/roles#main">main</a>
  * role in the ARIA specification.
diff --git a/user/src/com/google/gwt/aria/client/MainRoleImpl.java b/user/src/com/google/gwt/aria/client/MainRoleImpl.java
index e8e5641..381785b 100644
--- a/user/src/com/google/gwt/aria/client/MainRoleImpl.java
+++ b/user/src/com/google/gwt/aria/client/MainRoleImpl.java
@@ -28,272 +28,17 @@
   }
 
   @Override
-  public String getAriaAtomicProperty(Element element) {
-    return Property.ATOMIC.get(element);
-  }
-
-  @Override
-  public String getAriaBusyState(Element element) {
-    return State.BUSY.get(element);
-  }
-
-  @Override
-  public String getAriaControlsProperty(Element element) {
-    return Property.CONTROLS.get(element);
-  }
-
-  @Override
-  public String getAriaDescribedbyProperty(Element element) {
-    return Property.DESCRIBEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaDisabledState(Element element) {
-    return State.DISABLED.get(element);
-  }
-
-  @Override
-  public String getAriaDropeffectProperty(Element element) {
-    return Property.DROPEFFECT.get(element);
-  }
-
-  @Override
   public String getAriaExpandedState(Element element) {
     return State.EXPANDED.get(element);
   }
 
   @Override
-  public String getAriaFlowtoProperty(Element element) {
-    return Property.FLOWTO.get(element);
-  }
-
-  @Override
-  public String getAriaGrabbedState(Element element) {
-    return State.GRABBED.get(element);
-  }
-
-  @Override
-  public String getAriaHaspopupProperty(Element element) {
-    return Property.HASPOPUP.get(element);
-  }
-
-  @Override
-  public String getAriaHiddenState(Element element) {
-    return State.HIDDEN.get(element);
-  }
-
-  @Override
-  public String getAriaInvalidState(Element element) {
-    return State.INVALID.get(element);
-  }
-
-  @Override
-  public String getAriaLabelledbyProperty(Element element) {
-    return Property.LABELLEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaLabelProperty(Element element) {
-    return Property.LABEL.get(element);
-  }
-
-  @Override
-  public String getAriaLiveProperty(Element element) {
-    return Property.LIVE.get(element);
-  }
-
-  @Override
-  public String getAriaOwnsProperty(Element element) {
-    return Property.OWNS.get(element);
-  }
-
-  @Override
-  public String getAriaRelevantProperty(Element element) {
-    return Property.RELEVANT.get(element);
-  }
-
-  @Override
-  public String getTabindexExtraAttribute(Element element) {
-    return ExtraAttribute.TABINDEX.get(element);
-  }
-
-  @Override
-  public void removeAriaAtomicProperty(Element element) {
-    Property.ATOMIC.remove(element);
-  }
-
-  @Override
-  public void removeAriaBusyState(Element element) {
-    State.BUSY.remove(element);
-  }
-
-  @Override
-  public void removeAriaControlsProperty(Element element) {
-    Property.CONTROLS.remove(element);
-  }
-
-  @Override
-  public void removeAriaDescribedbyProperty(Element element) {
-    Property.DESCRIBEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaDisabledState(Element element) {
-    State.DISABLED.remove(element);
-  }
-
-  @Override
-  public void removeAriaDropeffectProperty(Element element) {
-    Property.DROPEFFECT.remove(element);
-  }
-
-  @Override
   public void removeAriaExpandedState(Element element) {
     State.EXPANDED.remove(element);
   }
 
   @Override
-  public void removeAriaFlowtoProperty(Element element) {
-    Property.FLOWTO.remove(element);
-  }
-
-  @Override
-  public void removeAriaGrabbedState(Element element) {
-    State.GRABBED.remove(element);
-  }
-
-  @Override
-  public void removeAriaHaspopupProperty(Element element) {
-    Property.HASPOPUP.remove(element);
-  }
-
-  @Override
-  public void removeAriaHiddenState(Element element) {
-    State.HIDDEN.remove(element);
-  }
-
-  @Override
-  public void removeAriaInvalidState(Element element) {
-    State.INVALID.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelledbyProperty(Element element) {
-    Property.LABELLEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelProperty(Element element) {
-    Property.LABEL.remove(element);
-  }
-
-  @Override
-  public void removeAriaLiveProperty(Element element) {
-    Property.LIVE.remove(element);
-  }
-
-  @Override
-  public void removeAriaOwnsProperty(Element element) {
-    Property.OWNS.remove(element);
-  }
-
-  @Override
-  public void removeAriaRelevantProperty(Element element) {
-    Property.RELEVANT.remove(element);
-  }
-
-  @Override
-  public void removeTabindexExtraAttribute(Element element) {
-    ExtraAttribute.TABINDEX.remove(element);
-  }
-
-  @Override
-  public void setAriaAtomicProperty(Element element, boolean value) {
-    Property.ATOMIC.set(element, value);
-  }
-
-  @Override
-  public void setAriaBusyState(Element element, boolean value) {
-    State.BUSY.set(element, value);
-  }
-
-  @Override
-  public void setAriaControlsProperty(Element element, IdReference... value) {
-    Property.CONTROLS.set(element, value);
-  }
-
-  @Override
-  public void setAriaDescribedbyProperty(Element element, IdReference... value) {
-    Property.DESCRIBEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaDisabledState(Element element, boolean value) {
-    State.DISABLED.set(element, value);
-  }
-
-  @Override
-  public void setAriaDropeffectProperty(Element element, DropeffectValue... value) {
-    Property.DROPEFFECT.set(element, value);
-  }
-
-  @Override
   public void setAriaExpandedState(Element element, ExpandedValue value) {
     State.EXPANDED.set(element, value);
   }
-
-  @Override
-  public void setAriaFlowtoProperty(Element element, IdReference... value) {
-    Property.FLOWTO.set(element, value);
-  }
-
-  @Override
-  public void setAriaGrabbedState(Element element, GrabbedValue value) {
-    State.GRABBED.set(element, value);
-  }
-
-  @Override
-  public void setAriaHaspopupProperty(Element element, boolean value) {
-    Property.HASPOPUP.set(element, value);
-  }
-
-  @Override
-  public void setAriaHiddenState(Element element, boolean value) {
-    State.HIDDEN.set(element, value);
-  }
-
-  @Override
-  public void setAriaInvalidState(Element element, InvalidValue value) {
-    State.INVALID.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelledbyProperty(Element element, IdReference... value) {
-    Property.LABELLEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelProperty(Element element, String value) {
-    Property.LABEL.set(element, value);
-  }
-
-  @Override
-  public void setAriaLiveProperty(Element element, LiveValue value) {
-    Property.LIVE.set(element, value);
-  }
-
-  @Override
-  public void setAriaOwnsProperty(Element element, IdReference... value) {
-    Property.OWNS.set(element, value);
-  }
-
-  @Override
-  public void setAriaRelevantProperty(Element element, RelevantValue... value) {
-    Property.RELEVANT.set(element, value);
-  }
-
-  @Override
-  public void setTabindexExtraAttribute(Element element, int value) {
-    ExtraAttribute.TABINDEX.set(element, value);
-  }
 }
diff --git a/user/src/com/google/gwt/aria/client/MarqueeRole.java b/user/src/com/google/gwt/aria/client/MarqueeRole.java
index f2bdb6e..75a45b5 100644
--- a/user/src/com/google/gwt/aria/client/MarqueeRole.java
+++ b/user/src/com/google/gwt/aria/client/MarqueeRole.java
@@ -17,7 +17,6 @@
 // This is auto-generated code.  Do not manually edit! //
 /////////////////////////////////////////////////////////
 
-
 /**
  * A type that represents the <a href="http://www.w3.org/TR/wai-aria/roles#marquee">marquee</a>
  * role in the ARIA specification.
diff --git a/user/src/com/google/gwt/aria/client/MarqueeRoleImpl.java b/user/src/com/google/gwt/aria/client/MarqueeRoleImpl.java
index a920949..52dc59b 100644
--- a/user/src/com/google/gwt/aria/client/MarqueeRoleImpl.java
+++ b/user/src/com/google/gwt/aria/client/MarqueeRoleImpl.java
@@ -28,272 +28,17 @@
   }
 
   @Override
-  public String getAriaAtomicProperty(Element element) {
-    return Property.ATOMIC.get(element);
-  }
-
-  @Override
-  public String getAriaBusyState(Element element) {
-    return State.BUSY.get(element);
-  }
-
-  @Override
-  public String getAriaControlsProperty(Element element) {
-    return Property.CONTROLS.get(element);
-  }
-
-  @Override
-  public String getAriaDescribedbyProperty(Element element) {
-    return Property.DESCRIBEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaDisabledState(Element element) {
-    return State.DISABLED.get(element);
-  }
-
-  @Override
-  public String getAriaDropeffectProperty(Element element) {
-    return Property.DROPEFFECT.get(element);
-  }
-
-  @Override
   public String getAriaExpandedState(Element element) {
     return State.EXPANDED.get(element);
   }
 
   @Override
-  public String getAriaFlowtoProperty(Element element) {
-    return Property.FLOWTO.get(element);
-  }
-
-  @Override
-  public String getAriaGrabbedState(Element element) {
-    return State.GRABBED.get(element);
-  }
-
-  @Override
-  public String getAriaHaspopupProperty(Element element) {
-    return Property.HASPOPUP.get(element);
-  }
-
-  @Override
-  public String getAriaHiddenState(Element element) {
-    return State.HIDDEN.get(element);
-  }
-
-  @Override
-  public String getAriaInvalidState(Element element) {
-    return State.INVALID.get(element);
-  }
-
-  @Override
-  public String getAriaLabelledbyProperty(Element element) {
-    return Property.LABELLEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaLabelProperty(Element element) {
-    return Property.LABEL.get(element);
-  }
-
-  @Override
-  public String getAriaLiveProperty(Element element) {
-    return Property.LIVE.get(element);
-  }
-
-  @Override
-  public String getAriaOwnsProperty(Element element) {
-    return Property.OWNS.get(element);
-  }
-
-  @Override
-  public String getAriaRelevantProperty(Element element) {
-    return Property.RELEVANT.get(element);
-  }
-
-  @Override
-  public String getTabindexExtraAttribute(Element element) {
-    return ExtraAttribute.TABINDEX.get(element);
-  }
-
-  @Override
-  public void removeAriaAtomicProperty(Element element) {
-    Property.ATOMIC.remove(element);
-  }
-
-  @Override
-  public void removeAriaBusyState(Element element) {
-    State.BUSY.remove(element);
-  }
-
-  @Override
-  public void removeAriaControlsProperty(Element element) {
-    Property.CONTROLS.remove(element);
-  }
-
-  @Override
-  public void removeAriaDescribedbyProperty(Element element) {
-    Property.DESCRIBEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaDisabledState(Element element) {
-    State.DISABLED.remove(element);
-  }
-
-  @Override
-  public void removeAriaDropeffectProperty(Element element) {
-    Property.DROPEFFECT.remove(element);
-  }
-
-  @Override
   public void removeAriaExpandedState(Element element) {
     State.EXPANDED.remove(element);
   }
 
   @Override
-  public void removeAriaFlowtoProperty(Element element) {
-    Property.FLOWTO.remove(element);
-  }
-
-  @Override
-  public void removeAriaGrabbedState(Element element) {
-    State.GRABBED.remove(element);
-  }
-
-  @Override
-  public void removeAriaHaspopupProperty(Element element) {
-    Property.HASPOPUP.remove(element);
-  }
-
-  @Override
-  public void removeAriaHiddenState(Element element) {
-    State.HIDDEN.remove(element);
-  }
-
-  @Override
-  public void removeAriaInvalidState(Element element) {
-    State.INVALID.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelledbyProperty(Element element) {
-    Property.LABELLEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelProperty(Element element) {
-    Property.LABEL.remove(element);
-  }
-
-  @Override
-  public void removeAriaLiveProperty(Element element) {
-    Property.LIVE.remove(element);
-  }
-
-  @Override
-  public void removeAriaOwnsProperty(Element element) {
-    Property.OWNS.remove(element);
-  }
-
-  @Override
-  public void removeAriaRelevantProperty(Element element) {
-    Property.RELEVANT.remove(element);
-  }
-
-  @Override
-  public void removeTabindexExtraAttribute(Element element) {
-    ExtraAttribute.TABINDEX.remove(element);
-  }
-
-  @Override
-  public void setAriaAtomicProperty(Element element, boolean value) {
-    Property.ATOMIC.set(element, value);
-  }
-
-  @Override
-  public void setAriaBusyState(Element element, boolean value) {
-    State.BUSY.set(element, value);
-  }
-
-  @Override
-  public void setAriaControlsProperty(Element element, IdReference... value) {
-    Property.CONTROLS.set(element, value);
-  }
-
-  @Override
-  public void setAriaDescribedbyProperty(Element element, IdReference... value) {
-    Property.DESCRIBEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaDisabledState(Element element, boolean value) {
-    State.DISABLED.set(element, value);
-  }
-
-  @Override
-  public void setAriaDropeffectProperty(Element element, DropeffectValue... value) {
-    Property.DROPEFFECT.set(element, value);
-  }
-
-  @Override
   public void setAriaExpandedState(Element element, ExpandedValue value) {
     State.EXPANDED.set(element, value);
   }
-
-  @Override
-  public void setAriaFlowtoProperty(Element element, IdReference... value) {
-    Property.FLOWTO.set(element, value);
-  }
-
-  @Override
-  public void setAriaGrabbedState(Element element, GrabbedValue value) {
-    State.GRABBED.set(element, value);
-  }
-
-  @Override
-  public void setAriaHaspopupProperty(Element element, boolean value) {
-    Property.HASPOPUP.set(element, value);
-  }
-
-  @Override
-  public void setAriaHiddenState(Element element, boolean value) {
-    State.HIDDEN.set(element, value);
-  }
-
-  @Override
-  public void setAriaInvalidState(Element element, InvalidValue value) {
-    State.INVALID.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelledbyProperty(Element element, IdReference... value) {
-    Property.LABELLEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelProperty(Element element, String value) {
-    Property.LABEL.set(element, value);
-  }
-
-  @Override
-  public void setAriaLiveProperty(Element element, LiveValue value) {
-    Property.LIVE.set(element, value);
-  }
-
-  @Override
-  public void setAriaOwnsProperty(Element element, IdReference... value) {
-    Property.OWNS.set(element, value);
-  }
-
-  @Override
-  public void setAriaRelevantProperty(Element element, RelevantValue... value) {
-    Property.RELEVANT.set(element, value);
-  }
-
-  @Override
-  public void setTabindexExtraAttribute(Element element, int value) {
-    ExtraAttribute.TABINDEX.set(element, value);
-  }
 }
diff --git a/user/src/com/google/gwt/aria/client/MathRole.java b/user/src/com/google/gwt/aria/client/MathRole.java
index 14216e7..a946376 100644
--- a/user/src/com/google/gwt/aria/client/MathRole.java
+++ b/user/src/com/google/gwt/aria/client/MathRole.java
@@ -17,7 +17,6 @@
 // This is auto-generated code.  Do not manually edit! //
 /////////////////////////////////////////////////////////
 
-
 /**
  * A type that represents the <a href="http://www.w3.org/TR/wai-aria/roles#math">math</a>
  * role in the ARIA specification.
diff --git a/user/src/com/google/gwt/aria/client/MathRoleImpl.java b/user/src/com/google/gwt/aria/client/MathRoleImpl.java
index 20e50d7..d09c6e3 100644
--- a/user/src/com/google/gwt/aria/client/MathRoleImpl.java
+++ b/user/src/com/google/gwt/aria/client/MathRoleImpl.java
@@ -28,272 +28,17 @@
   }
 
   @Override
-  public String getAriaAtomicProperty(Element element) {
-    return Property.ATOMIC.get(element);
-  }
-
-  @Override
-  public String getAriaBusyState(Element element) {
-    return State.BUSY.get(element);
-  }
-
-  @Override
-  public String getAriaControlsProperty(Element element) {
-    return Property.CONTROLS.get(element);
-  }
-
-  @Override
-  public String getAriaDescribedbyProperty(Element element) {
-    return Property.DESCRIBEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaDisabledState(Element element) {
-    return State.DISABLED.get(element);
-  }
-
-  @Override
-  public String getAriaDropeffectProperty(Element element) {
-    return Property.DROPEFFECT.get(element);
-  }
-
-  @Override
   public String getAriaExpandedState(Element element) {
     return State.EXPANDED.get(element);
   }
 
   @Override
-  public String getAriaFlowtoProperty(Element element) {
-    return Property.FLOWTO.get(element);
-  }
-
-  @Override
-  public String getAriaGrabbedState(Element element) {
-    return State.GRABBED.get(element);
-  }
-
-  @Override
-  public String getAriaHaspopupProperty(Element element) {
-    return Property.HASPOPUP.get(element);
-  }
-
-  @Override
-  public String getAriaHiddenState(Element element) {
-    return State.HIDDEN.get(element);
-  }
-
-  @Override
-  public String getAriaInvalidState(Element element) {
-    return State.INVALID.get(element);
-  }
-
-  @Override
-  public String getAriaLabelledbyProperty(Element element) {
-    return Property.LABELLEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaLabelProperty(Element element) {
-    return Property.LABEL.get(element);
-  }
-
-  @Override
-  public String getAriaLiveProperty(Element element) {
-    return Property.LIVE.get(element);
-  }
-
-  @Override
-  public String getAriaOwnsProperty(Element element) {
-    return Property.OWNS.get(element);
-  }
-
-  @Override
-  public String getAriaRelevantProperty(Element element) {
-    return Property.RELEVANT.get(element);
-  }
-
-  @Override
-  public String getTabindexExtraAttribute(Element element) {
-    return ExtraAttribute.TABINDEX.get(element);
-  }
-
-  @Override
-  public void removeAriaAtomicProperty(Element element) {
-    Property.ATOMIC.remove(element);
-  }
-
-  @Override
-  public void removeAriaBusyState(Element element) {
-    State.BUSY.remove(element);
-  }
-
-  @Override
-  public void removeAriaControlsProperty(Element element) {
-    Property.CONTROLS.remove(element);
-  }
-
-  @Override
-  public void removeAriaDescribedbyProperty(Element element) {
-    Property.DESCRIBEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaDisabledState(Element element) {
-    State.DISABLED.remove(element);
-  }
-
-  @Override
-  public void removeAriaDropeffectProperty(Element element) {
-    Property.DROPEFFECT.remove(element);
-  }
-
-  @Override
   public void removeAriaExpandedState(Element element) {
     State.EXPANDED.remove(element);
   }
 
   @Override
-  public void removeAriaFlowtoProperty(Element element) {
-    Property.FLOWTO.remove(element);
-  }
-
-  @Override
-  public void removeAriaGrabbedState(Element element) {
-    State.GRABBED.remove(element);
-  }
-
-  @Override
-  public void removeAriaHaspopupProperty(Element element) {
-    Property.HASPOPUP.remove(element);
-  }
-
-  @Override
-  public void removeAriaHiddenState(Element element) {
-    State.HIDDEN.remove(element);
-  }
-
-  @Override
-  public void removeAriaInvalidState(Element element) {
-    State.INVALID.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelledbyProperty(Element element) {
-    Property.LABELLEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelProperty(Element element) {
-    Property.LABEL.remove(element);
-  }
-
-  @Override
-  public void removeAriaLiveProperty(Element element) {
-    Property.LIVE.remove(element);
-  }
-
-  @Override
-  public void removeAriaOwnsProperty(Element element) {
-    Property.OWNS.remove(element);
-  }
-
-  @Override
-  public void removeAriaRelevantProperty(Element element) {
-    Property.RELEVANT.remove(element);
-  }
-
-  @Override
-  public void removeTabindexExtraAttribute(Element element) {
-    ExtraAttribute.TABINDEX.remove(element);
-  }
-
-  @Override
-  public void setAriaAtomicProperty(Element element, boolean value) {
-    Property.ATOMIC.set(element, value);
-  }
-
-  @Override
-  public void setAriaBusyState(Element element, boolean value) {
-    State.BUSY.set(element, value);
-  }
-
-  @Override
-  public void setAriaControlsProperty(Element element, IdReference... value) {
-    Property.CONTROLS.set(element, value);
-  }
-
-  @Override
-  public void setAriaDescribedbyProperty(Element element, IdReference... value) {
-    Property.DESCRIBEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaDisabledState(Element element, boolean value) {
-    State.DISABLED.set(element, value);
-  }
-
-  @Override
-  public void setAriaDropeffectProperty(Element element, DropeffectValue... value) {
-    Property.DROPEFFECT.set(element, value);
-  }
-
-  @Override
   public void setAriaExpandedState(Element element, ExpandedValue value) {
     State.EXPANDED.set(element, value);
   }
-
-  @Override
-  public void setAriaFlowtoProperty(Element element, IdReference... value) {
-    Property.FLOWTO.set(element, value);
-  }
-
-  @Override
-  public void setAriaGrabbedState(Element element, GrabbedValue value) {
-    State.GRABBED.set(element, value);
-  }
-
-  @Override
-  public void setAriaHaspopupProperty(Element element, boolean value) {
-    Property.HASPOPUP.set(element, value);
-  }
-
-  @Override
-  public void setAriaHiddenState(Element element, boolean value) {
-    State.HIDDEN.set(element, value);
-  }
-
-  @Override
-  public void setAriaInvalidState(Element element, InvalidValue value) {
-    State.INVALID.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelledbyProperty(Element element, IdReference... value) {
-    Property.LABELLEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelProperty(Element element, String value) {
-    Property.LABEL.set(element, value);
-  }
-
-  @Override
-  public void setAriaLiveProperty(Element element, LiveValue value) {
-    Property.LIVE.set(element, value);
-  }
-
-  @Override
-  public void setAriaOwnsProperty(Element element, IdReference... value) {
-    Property.OWNS.set(element, value);
-  }
-
-  @Override
-  public void setAriaRelevantProperty(Element element, RelevantValue... value) {
-    Property.RELEVANT.set(element, value);
-  }
-
-  @Override
-  public void setTabindexExtraAttribute(Element element, int value) {
-    ExtraAttribute.TABINDEX.set(element, value);
-  }
 }
diff --git a/user/src/com/google/gwt/aria/client/MenuRole.java b/user/src/com/google/gwt/aria/client/MenuRole.java
index 6e81a78..430b402 100644
--- a/user/src/com/google/gwt/aria/client/MenuRole.java
+++ b/user/src/com/google/gwt/aria/client/MenuRole.java
@@ -17,7 +17,6 @@
 // This is auto-generated code.  Do not manually edit! //
 /////////////////////////////////////////////////////////
 
-
 /**
  * A type that represents the <a href="http://www.w3.org/TR/wai-aria/roles#menu">menu</a>
  * role in the ARIA specification.
diff --git a/user/src/com/google/gwt/aria/client/MenuRoleImpl.java b/user/src/com/google/gwt/aria/client/MenuRoleImpl.java
index 033ffc2..2de8486 100644
--- a/user/src/com/google/gwt/aria/client/MenuRoleImpl.java
+++ b/user/src/com/google/gwt/aria/client/MenuRoleImpl.java
@@ -33,282 +33,27 @@
   }
 
   @Override
-  public String getAriaAtomicProperty(Element element) {
-    return Property.ATOMIC.get(element);
-  }
-
-  @Override
-  public String getAriaBusyState(Element element) {
-    return State.BUSY.get(element);
-  }
-
-  @Override
-  public String getAriaControlsProperty(Element element) {
-    return Property.CONTROLS.get(element);
-  }
-
-  @Override
-  public String getAriaDescribedbyProperty(Element element) {
-    return Property.DESCRIBEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaDisabledState(Element element) {
-    return State.DISABLED.get(element);
-  }
-
-  @Override
-  public String getAriaDropeffectProperty(Element element) {
-    return Property.DROPEFFECT.get(element);
-  }
-
-  @Override
   public String getAriaExpandedState(Element element) {
     return State.EXPANDED.get(element);
   }
 
   @Override
-  public String getAriaFlowtoProperty(Element element) {
-    return Property.FLOWTO.get(element);
-  }
-
-  @Override
-  public String getAriaGrabbedState(Element element) {
-    return State.GRABBED.get(element);
-  }
-
-  @Override
-  public String getAriaHaspopupProperty(Element element) {
-    return Property.HASPOPUP.get(element);
-  }
-
-  @Override
-  public String getAriaHiddenState(Element element) {
-    return State.HIDDEN.get(element);
-  }
-
-  @Override
-  public String getAriaInvalidState(Element element) {
-    return State.INVALID.get(element);
-  }
-
-  @Override
-  public String getAriaLabelledbyProperty(Element element) {
-    return Property.LABELLEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaLabelProperty(Element element) {
-    return Property.LABEL.get(element);
-  }
-
-  @Override
-  public String getAriaLiveProperty(Element element) {
-    return Property.LIVE.get(element);
-  }
-
-  @Override
-  public String getAriaOwnsProperty(Element element) {
-    return Property.OWNS.get(element);
-  }
-
-  @Override
-  public String getAriaRelevantProperty(Element element) {
-    return Property.RELEVANT.get(element);
-  }
-
-  @Override
-  public String getTabindexExtraAttribute(Element element) {
-    return ExtraAttribute.TABINDEX.get(element);
-  }
-
-  @Override
   public void removeAriaActivedescendantProperty(Element element) {
     Property.ACTIVEDESCENDANT.remove(element);
   }
 
   @Override
-  public void removeAriaAtomicProperty(Element element) {
-    Property.ATOMIC.remove(element);
-  }
-
-  @Override
-  public void removeAriaBusyState(Element element) {
-    State.BUSY.remove(element);
-  }
-
-  @Override
-  public void removeAriaControlsProperty(Element element) {
-    Property.CONTROLS.remove(element);
-  }
-
-  @Override
-  public void removeAriaDescribedbyProperty(Element element) {
-    Property.DESCRIBEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaDisabledState(Element element) {
-    State.DISABLED.remove(element);
-  }
-
-  @Override
-  public void removeAriaDropeffectProperty(Element element) {
-    Property.DROPEFFECT.remove(element);
-  }
-
-  @Override
   public void removeAriaExpandedState(Element element) {
     State.EXPANDED.remove(element);
   }
 
   @Override
-  public void removeAriaFlowtoProperty(Element element) {
-    Property.FLOWTO.remove(element);
-  }
-
-  @Override
-  public void removeAriaGrabbedState(Element element) {
-    State.GRABBED.remove(element);
-  }
-
-  @Override
-  public void removeAriaHaspopupProperty(Element element) {
-    Property.HASPOPUP.remove(element);
-  }
-
-  @Override
-  public void removeAriaHiddenState(Element element) {
-    State.HIDDEN.remove(element);
-  }
-
-  @Override
-  public void removeAriaInvalidState(Element element) {
-    State.INVALID.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelledbyProperty(Element element) {
-    Property.LABELLEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelProperty(Element element) {
-    Property.LABEL.remove(element);
-  }
-
-  @Override
-  public void removeAriaLiveProperty(Element element) {
-    Property.LIVE.remove(element);
-  }
-
-  @Override
-  public void removeAriaOwnsProperty(Element element) {
-    Property.OWNS.remove(element);
-  }
-
-  @Override
-  public void removeAriaRelevantProperty(Element element) {
-    Property.RELEVANT.remove(element);
-  }
-
-  @Override
-  public void removeTabindexExtraAttribute(Element element) {
-    ExtraAttribute.TABINDEX.remove(element);
-  }
-
-  @Override
   public void setAriaActivedescendantProperty(Element element, IdReference value) {
     Property.ACTIVEDESCENDANT.set(element, value);
   }
 
   @Override
-  public void setAriaAtomicProperty(Element element, boolean value) {
-    Property.ATOMIC.set(element, value);
-  }
-
-  @Override
-  public void setAriaBusyState(Element element, boolean value) {
-    State.BUSY.set(element, value);
-  }
-
-  @Override
-  public void setAriaControlsProperty(Element element, IdReference... value) {
-    Property.CONTROLS.set(element, value);
-  }
-
-  @Override
-  public void setAriaDescribedbyProperty(Element element, IdReference... value) {
-    Property.DESCRIBEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaDisabledState(Element element, boolean value) {
-    State.DISABLED.set(element, value);
-  }
-
-  @Override
-  public void setAriaDropeffectProperty(Element element, DropeffectValue... value) {
-    Property.DROPEFFECT.set(element, value);
-  }
-
-  @Override
   public void setAriaExpandedState(Element element, ExpandedValue value) {
     State.EXPANDED.set(element, value);
   }
-
-  @Override
-  public void setAriaFlowtoProperty(Element element, IdReference... value) {
-    Property.FLOWTO.set(element, value);
-  }
-
-  @Override
-  public void setAriaGrabbedState(Element element, GrabbedValue value) {
-    State.GRABBED.set(element, value);
-  }
-
-  @Override
-  public void setAriaHaspopupProperty(Element element, boolean value) {
-    Property.HASPOPUP.set(element, value);
-  }
-
-  @Override
-  public void setAriaHiddenState(Element element, boolean value) {
-    State.HIDDEN.set(element, value);
-  }
-
-  @Override
-  public void setAriaInvalidState(Element element, InvalidValue value) {
-    State.INVALID.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelledbyProperty(Element element, IdReference... value) {
-    Property.LABELLEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelProperty(Element element, String value) {
-    Property.LABEL.set(element, value);
-  }
-
-  @Override
-  public void setAriaLiveProperty(Element element, LiveValue value) {
-    Property.LIVE.set(element, value);
-  }
-
-  @Override
-  public void setAriaOwnsProperty(Element element, IdReference... value) {
-    Property.OWNS.set(element, value);
-  }
-
-  @Override
-  public void setAriaRelevantProperty(Element element, RelevantValue... value) {
-    Property.RELEVANT.set(element, value);
-  }
-
-  @Override
-  public void setTabindexExtraAttribute(Element element, int value) {
-    ExtraAttribute.TABINDEX.set(element, value);
-  }
 }
diff --git a/user/src/com/google/gwt/aria/client/MenubarRole.java b/user/src/com/google/gwt/aria/client/MenubarRole.java
index 6236d34..0dac256 100644
--- a/user/src/com/google/gwt/aria/client/MenubarRole.java
+++ b/user/src/com/google/gwt/aria/client/MenubarRole.java
@@ -17,7 +17,6 @@
 // This is auto-generated code.  Do not manually edit! //
 /////////////////////////////////////////////////////////
 
-
 /**
  * A type that represents the <a href="http://www.w3.org/TR/wai-aria/roles#menubar">menubar</a>
  * role in the ARIA specification.
diff --git a/user/src/com/google/gwt/aria/client/MenubarRoleImpl.java b/user/src/com/google/gwt/aria/client/MenubarRoleImpl.java
index cc85d67..28b8f78 100644
--- a/user/src/com/google/gwt/aria/client/MenubarRoleImpl.java
+++ b/user/src/com/google/gwt/aria/client/MenubarRoleImpl.java
@@ -33,282 +33,27 @@
   }
 
   @Override
-  public String getAriaAtomicProperty(Element element) {
-    return Property.ATOMIC.get(element);
-  }
-
-  @Override
-  public String getAriaBusyState(Element element) {
-    return State.BUSY.get(element);
-  }
-
-  @Override
-  public String getAriaControlsProperty(Element element) {
-    return Property.CONTROLS.get(element);
-  }
-
-  @Override
-  public String getAriaDescribedbyProperty(Element element) {
-    return Property.DESCRIBEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaDisabledState(Element element) {
-    return State.DISABLED.get(element);
-  }
-
-  @Override
-  public String getAriaDropeffectProperty(Element element) {
-    return Property.DROPEFFECT.get(element);
-  }
-
-  @Override
   public String getAriaExpandedState(Element element) {
     return State.EXPANDED.get(element);
   }
 
   @Override
-  public String getAriaFlowtoProperty(Element element) {
-    return Property.FLOWTO.get(element);
-  }
-
-  @Override
-  public String getAriaGrabbedState(Element element) {
-    return State.GRABBED.get(element);
-  }
-
-  @Override
-  public String getAriaHaspopupProperty(Element element) {
-    return Property.HASPOPUP.get(element);
-  }
-
-  @Override
-  public String getAriaHiddenState(Element element) {
-    return State.HIDDEN.get(element);
-  }
-
-  @Override
-  public String getAriaInvalidState(Element element) {
-    return State.INVALID.get(element);
-  }
-
-  @Override
-  public String getAriaLabelledbyProperty(Element element) {
-    return Property.LABELLEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaLabelProperty(Element element) {
-    return Property.LABEL.get(element);
-  }
-
-  @Override
-  public String getAriaLiveProperty(Element element) {
-    return Property.LIVE.get(element);
-  }
-
-  @Override
-  public String getAriaOwnsProperty(Element element) {
-    return Property.OWNS.get(element);
-  }
-
-  @Override
-  public String getAriaRelevantProperty(Element element) {
-    return Property.RELEVANT.get(element);
-  }
-
-  @Override
-  public String getTabindexExtraAttribute(Element element) {
-    return ExtraAttribute.TABINDEX.get(element);
-  }
-
-  @Override
   public void removeAriaActivedescendantProperty(Element element) {
     Property.ACTIVEDESCENDANT.remove(element);
   }
 
   @Override
-  public void removeAriaAtomicProperty(Element element) {
-    Property.ATOMIC.remove(element);
-  }
-
-  @Override
-  public void removeAriaBusyState(Element element) {
-    State.BUSY.remove(element);
-  }
-
-  @Override
-  public void removeAriaControlsProperty(Element element) {
-    Property.CONTROLS.remove(element);
-  }
-
-  @Override
-  public void removeAriaDescribedbyProperty(Element element) {
-    Property.DESCRIBEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaDisabledState(Element element) {
-    State.DISABLED.remove(element);
-  }
-
-  @Override
-  public void removeAriaDropeffectProperty(Element element) {
-    Property.DROPEFFECT.remove(element);
-  }
-
-  @Override
   public void removeAriaExpandedState(Element element) {
     State.EXPANDED.remove(element);
   }
 
   @Override
-  public void removeAriaFlowtoProperty(Element element) {
-    Property.FLOWTO.remove(element);
-  }
-
-  @Override
-  public void removeAriaGrabbedState(Element element) {
-    State.GRABBED.remove(element);
-  }
-
-  @Override
-  public void removeAriaHaspopupProperty(Element element) {
-    Property.HASPOPUP.remove(element);
-  }
-
-  @Override
-  public void removeAriaHiddenState(Element element) {
-    State.HIDDEN.remove(element);
-  }
-
-  @Override
-  public void removeAriaInvalidState(Element element) {
-    State.INVALID.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelledbyProperty(Element element) {
-    Property.LABELLEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelProperty(Element element) {
-    Property.LABEL.remove(element);
-  }
-
-  @Override
-  public void removeAriaLiveProperty(Element element) {
-    Property.LIVE.remove(element);
-  }
-
-  @Override
-  public void removeAriaOwnsProperty(Element element) {
-    Property.OWNS.remove(element);
-  }
-
-  @Override
-  public void removeAriaRelevantProperty(Element element) {
-    Property.RELEVANT.remove(element);
-  }
-
-  @Override
-  public void removeTabindexExtraAttribute(Element element) {
-    ExtraAttribute.TABINDEX.remove(element);
-  }
-
-  @Override
   public void setAriaActivedescendantProperty(Element element, IdReference value) {
     Property.ACTIVEDESCENDANT.set(element, value);
   }
 
   @Override
-  public void setAriaAtomicProperty(Element element, boolean value) {
-    Property.ATOMIC.set(element, value);
-  }
-
-  @Override
-  public void setAriaBusyState(Element element, boolean value) {
-    State.BUSY.set(element, value);
-  }
-
-  @Override
-  public void setAriaControlsProperty(Element element, IdReference... value) {
-    Property.CONTROLS.set(element, value);
-  }
-
-  @Override
-  public void setAriaDescribedbyProperty(Element element, IdReference... value) {
-    Property.DESCRIBEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaDisabledState(Element element, boolean value) {
-    State.DISABLED.set(element, value);
-  }
-
-  @Override
-  public void setAriaDropeffectProperty(Element element, DropeffectValue... value) {
-    Property.DROPEFFECT.set(element, value);
-  }
-
-  @Override
   public void setAriaExpandedState(Element element, ExpandedValue value) {
     State.EXPANDED.set(element, value);
   }
-
-  @Override
-  public void setAriaFlowtoProperty(Element element, IdReference... value) {
-    Property.FLOWTO.set(element, value);
-  }
-
-  @Override
-  public void setAriaGrabbedState(Element element, GrabbedValue value) {
-    State.GRABBED.set(element, value);
-  }
-
-  @Override
-  public void setAriaHaspopupProperty(Element element, boolean value) {
-    Property.HASPOPUP.set(element, value);
-  }
-
-  @Override
-  public void setAriaHiddenState(Element element, boolean value) {
-    State.HIDDEN.set(element, value);
-  }
-
-  @Override
-  public void setAriaInvalidState(Element element, InvalidValue value) {
-    State.INVALID.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelledbyProperty(Element element, IdReference... value) {
-    Property.LABELLEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelProperty(Element element, String value) {
-    Property.LABEL.set(element, value);
-  }
-
-  @Override
-  public void setAriaLiveProperty(Element element, LiveValue value) {
-    Property.LIVE.set(element, value);
-  }
-
-  @Override
-  public void setAriaOwnsProperty(Element element, IdReference... value) {
-    Property.OWNS.set(element, value);
-  }
-
-  @Override
-  public void setAriaRelevantProperty(Element element, RelevantValue... value) {
-    Property.RELEVANT.set(element, value);
-  }
-
-  @Override
-  public void setTabindexExtraAttribute(Element element, int value) {
-    ExtraAttribute.TABINDEX.set(element, value);
-  }
 }
diff --git a/user/src/com/google/gwt/aria/client/MenuitemRole.java b/user/src/com/google/gwt/aria/client/MenuitemRole.java
index a8a2ad8..caf73f7 100644
--- a/user/src/com/google/gwt/aria/client/MenuitemRole.java
+++ b/user/src/com/google/gwt/aria/client/MenuitemRole.java
@@ -17,7 +17,6 @@
 // This is auto-generated code.  Do not manually edit! //
 /////////////////////////////////////////////////////////
 
-
 /**
  * A type that represents the <a href="http://www.w3.org/TR/wai-aria/roles#menuitem">menuitem</a>
  * role in the ARIA specification.
diff --git a/user/src/com/google/gwt/aria/client/MenuitemRoleImpl.java b/user/src/com/google/gwt/aria/client/MenuitemRoleImpl.java
index fc80d10..837275b 100644
--- a/user/src/com/google/gwt/aria/client/MenuitemRoleImpl.java
+++ b/user/src/com/google/gwt/aria/client/MenuitemRoleImpl.java
@@ -17,8 +17,6 @@
 // This is auto-generated code.  Do not manually edit! //
 /////////////////////////////////////////////////////////
 
-import com.google.gwt.dom.client.Element;
-
 /**
  * <p>Implements {@link MenuitemRole}.</p>
  */
@@ -27,258 +25,4 @@
     super(roleName);
   }
 
-  @Override
-  public String getAriaAtomicProperty(Element element) {
-    return Property.ATOMIC.get(element);
-  }
-
-  @Override
-  public String getAriaBusyState(Element element) {
-    return State.BUSY.get(element);
-  }
-
-  @Override
-  public String getAriaControlsProperty(Element element) {
-    return Property.CONTROLS.get(element);
-  }
-
-  @Override
-  public String getAriaDescribedbyProperty(Element element) {
-    return Property.DESCRIBEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaDisabledState(Element element) {
-    return State.DISABLED.get(element);
-  }
-
-  @Override
-  public String getAriaDropeffectProperty(Element element) {
-    return Property.DROPEFFECT.get(element);
-  }
-
-  @Override
-  public String getAriaFlowtoProperty(Element element) {
-    return Property.FLOWTO.get(element);
-  }
-
-  @Override
-  public String getAriaGrabbedState(Element element) {
-    return State.GRABBED.get(element);
-  }
-
-  @Override
-  public String getAriaHaspopupProperty(Element element) {
-    return Property.HASPOPUP.get(element);
-  }
-
-  @Override
-  public String getAriaHiddenState(Element element) {
-    return State.HIDDEN.get(element);
-  }
-
-  @Override
-  public String getAriaInvalidState(Element element) {
-    return State.INVALID.get(element);
-  }
-
-  @Override
-  public String getAriaLabelledbyProperty(Element element) {
-    return Property.LABELLEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaLabelProperty(Element element) {
-    return Property.LABEL.get(element);
-  }
-
-  @Override
-  public String getAriaLiveProperty(Element element) {
-    return Property.LIVE.get(element);
-  }
-
-  @Override
-  public String getAriaOwnsProperty(Element element) {
-    return Property.OWNS.get(element);
-  }
-
-  @Override
-  public String getAriaRelevantProperty(Element element) {
-    return Property.RELEVANT.get(element);
-  }
-
-  @Override
-  public String getTabindexExtraAttribute(Element element) {
-    return ExtraAttribute.TABINDEX.get(element);
-  }
-
-  @Override
-  public void removeAriaAtomicProperty(Element element) {
-    Property.ATOMIC.remove(element);
-  }
-
-  @Override
-  public void removeAriaBusyState(Element element) {
-    State.BUSY.remove(element);
-  }
-
-  @Override
-  public void removeAriaControlsProperty(Element element) {
-    Property.CONTROLS.remove(element);
-  }
-
-  @Override
-  public void removeAriaDescribedbyProperty(Element element) {
-    Property.DESCRIBEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaDisabledState(Element element) {
-    State.DISABLED.remove(element);
-  }
-
-  @Override
-  public void removeAriaDropeffectProperty(Element element) {
-    Property.DROPEFFECT.remove(element);
-  }
-
-  @Override
-  public void removeAriaFlowtoProperty(Element element) {
-    Property.FLOWTO.remove(element);
-  }
-
-  @Override
-  public void removeAriaGrabbedState(Element element) {
-    State.GRABBED.remove(element);
-  }
-
-  @Override
-  public void removeAriaHaspopupProperty(Element element) {
-    Property.HASPOPUP.remove(element);
-  }
-
-  @Override
-  public void removeAriaHiddenState(Element element) {
-    State.HIDDEN.remove(element);
-  }
-
-  @Override
-  public void removeAriaInvalidState(Element element) {
-    State.INVALID.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelledbyProperty(Element element) {
-    Property.LABELLEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelProperty(Element element) {
-    Property.LABEL.remove(element);
-  }
-
-  @Override
-  public void removeAriaLiveProperty(Element element) {
-    Property.LIVE.remove(element);
-  }
-
-  @Override
-  public void removeAriaOwnsProperty(Element element) {
-    Property.OWNS.remove(element);
-  }
-
-  @Override
-  public void removeAriaRelevantProperty(Element element) {
-    Property.RELEVANT.remove(element);
-  }
-
-  @Override
-  public void removeTabindexExtraAttribute(Element element) {
-    ExtraAttribute.TABINDEX.remove(element);
-  }
-
-  @Override
-  public void setAriaAtomicProperty(Element element, boolean value) {
-    Property.ATOMIC.set(element, value);
-  }
-
-  @Override
-  public void setAriaBusyState(Element element, boolean value) {
-    State.BUSY.set(element, value);
-  }
-
-  @Override
-  public void setAriaControlsProperty(Element element, IdReference... value) {
-    Property.CONTROLS.set(element, value);
-  }
-
-  @Override
-  public void setAriaDescribedbyProperty(Element element, IdReference... value) {
-    Property.DESCRIBEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaDisabledState(Element element, boolean value) {
-    State.DISABLED.set(element, value);
-  }
-
-  @Override
-  public void setAriaDropeffectProperty(Element element, DropeffectValue... value) {
-    Property.DROPEFFECT.set(element, value);
-  }
-
-  @Override
-  public void setAriaFlowtoProperty(Element element, IdReference... value) {
-    Property.FLOWTO.set(element, value);
-  }
-
-  @Override
-  public void setAriaGrabbedState(Element element, GrabbedValue value) {
-    State.GRABBED.set(element, value);
-  }
-
-  @Override
-  public void setAriaHaspopupProperty(Element element, boolean value) {
-    Property.HASPOPUP.set(element, value);
-  }
-
-  @Override
-  public void setAriaHiddenState(Element element, boolean value) {
-    State.HIDDEN.set(element, value);
-  }
-
-  @Override
-  public void setAriaInvalidState(Element element, InvalidValue value) {
-    State.INVALID.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelledbyProperty(Element element, IdReference... value) {
-    Property.LABELLEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelProperty(Element element, String value) {
-    Property.LABEL.set(element, value);
-  }
-
-  @Override
-  public void setAriaLiveProperty(Element element, LiveValue value) {
-    Property.LIVE.set(element, value);
-  }
-
-  @Override
-  public void setAriaOwnsProperty(Element element, IdReference... value) {
-    Property.OWNS.set(element, value);
-  }
-
-  @Override
-  public void setAriaRelevantProperty(Element element, RelevantValue... value) {
-    Property.RELEVANT.set(element, value);
-  }
-
-  @Override
-  public void setTabindexExtraAttribute(Element element, int value) {
-    ExtraAttribute.TABINDEX.set(element, value);
-  }
 }
diff --git a/user/src/com/google/gwt/aria/client/MenuitemcheckboxRole.java b/user/src/com/google/gwt/aria/client/MenuitemcheckboxRole.java
index 53e09cf..88e008a 100644
--- a/user/src/com/google/gwt/aria/client/MenuitemcheckboxRole.java
+++ b/user/src/com/google/gwt/aria/client/MenuitemcheckboxRole.java
@@ -17,7 +17,6 @@
 // This is auto-generated code.  Do not manually edit! //
 /////////////////////////////////////////////////////////
 
-
 /**
  * A type that represents the <a href="http://www.w3.org/TR/wai-aria/roles#menuitemcheckbox">menuitemcheckbox</a>
  * role in the ARIA specification.
diff --git a/user/src/com/google/gwt/aria/client/MenuitemcheckboxRoleImpl.java b/user/src/com/google/gwt/aria/client/MenuitemcheckboxRoleImpl.java
index 7e21b6c..16ef30c 100644
--- a/user/src/com/google/gwt/aria/client/MenuitemcheckboxRoleImpl.java
+++ b/user/src/com/google/gwt/aria/client/MenuitemcheckboxRoleImpl.java
@@ -28,272 +28,17 @@
   }
 
   @Override
-  public String getAriaAtomicProperty(Element element) {
-    return Property.ATOMIC.get(element);
-  }
-
-  @Override
-  public String getAriaBusyState(Element element) {
-    return State.BUSY.get(element);
-  }
-
-  @Override
   public String getAriaCheckedState(Element element) {
     return State.CHECKED.get(element);
   }
 
   @Override
-  public String getAriaControlsProperty(Element element) {
-    return Property.CONTROLS.get(element);
-  }
-
-  @Override
-  public String getAriaDescribedbyProperty(Element element) {
-    return Property.DESCRIBEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaDisabledState(Element element) {
-    return State.DISABLED.get(element);
-  }
-
-  @Override
-  public String getAriaDropeffectProperty(Element element) {
-    return Property.DROPEFFECT.get(element);
-  }
-
-  @Override
-  public String getAriaFlowtoProperty(Element element) {
-    return Property.FLOWTO.get(element);
-  }
-
-  @Override
-  public String getAriaGrabbedState(Element element) {
-    return State.GRABBED.get(element);
-  }
-
-  @Override
-  public String getAriaHaspopupProperty(Element element) {
-    return Property.HASPOPUP.get(element);
-  }
-
-  @Override
-  public String getAriaHiddenState(Element element) {
-    return State.HIDDEN.get(element);
-  }
-
-  @Override
-  public String getAriaInvalidState(Element element) {
-    return State.INVALID.get(element);
-  }
-
-  @Override
-  public String getAriaLabelledbyProperty(Element element) {
-    return Property.LABELLEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaLabelProperty(Element element) {
-    return Property.LABEL.get(element);
-  }
-
-  @Override
-  public String getAriaLiveProperty(Element element) {
-    return Property.LIVE.get(element);
-  }
-
-  @Override
-  public String getAriaOwnsProperty(Element element) {
-    return Property.OWNS.get(element);
-  }
-
-  @Override
-  public String getAriaRelevantProperty(Element element) {
-    return Property.RELEVANT.get(element);
-  }
-
-  @Override
-  public String getTabindexExtraAttribute(Element element) {
-    return ExtraAttribute.TABINDEX.get(element);
-  }
-
-  @Override
-  public void removeAriaAtomicProperty(Element element) {
-    Property.ATOMIC.remove(element);
-  }
-
-  @Override
-  public void removeAriaBusyState(Element element) {
-    State.BUSY.remove(element);
-  }
-
-  @Override
   public void removeAriaCheckedState(Element element) {
     State.CHECKED.remove(element);
   }
 
   @Override
-  public void removeAriaControlsProperty(Element element) {
-    Property.CONTROLS.remove(element);
-  }
-
-  @Override
-  public void removeAriaDescribedbyProperty(Element element) {
-    Property.DESCRIBEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaDisabledState(Element element) {
-    State.DISABLED.remove(element);
-  }
-
-  @Override
-  public void removeAriaDropeffectProperty(Element element) {
-    Property.DROPEFFECT.remove(element);
-  }
-
-  @Override
-  public void removeAriaFlowtoProperty(Element element) {
-    Property.FLOWTO.remove(element);
-  }
-
-  @Override
-  public void removeAriaGrabbedState(Element element) {
-    State.GRABBED.remove(element);
-  }
-
-  @Override
-  public void removeAriaHaspopupProperty(Element element) {
-    Property.HASPOPUP.remove(element);
-  }
-
-  @Override
-  public void removeAriaHiddenState(Element element) {
-    State.HIDDEN.remove(element);
-  }
-
-  @Override
-  public void removeAriaInvalidState(Element element) {
-    State.INVALID.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelledbyProperty(Element element) {
-    Property.LABELLEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelProperty(Element element) {
-    Property.LABEL.remove(element);
-  }
-
-  @Override
-  public void removeAriaLiveProperty(Element element) {
-    Property.LIVE.remove(element);
-  }
-
-  @Override
-  public void removeAriaOwnsProperty(Element element) {
-    Property.OWNS.remove(element);
-  }
-
-  @Override
-  public void removeAriaRelevantProperty(Element element) {
-    Property.RELEVANT.remove(element);
-  }
-
-  @Override
-  public void removeTabindexExtraAttribute(Element element) {
-    ExtraAttribute.TABINDEX.remove(element);
-  }
-
-  @Override
-  public void setAriaAtomicProperty(Element element, boolean value) {
-    Property.ATOMIC.set(element, value);
-  }
-
-  @Override
-  public void setAriaBusyState(Element element, boolean value) {
-    State.BUSY.set(element, value);
-  }
-
-  @Override
   public void setAriaCheckedState(Element element, CheckedValue value) {
     State.CHECKED.set(element, value);
   }
-
-  @Override
-  public void setAriaControlsProperty(Element element, IdReference... value) {
-    Property.CONTROLS.set(element, value);
-  }
-
-  @Override
-  public void setAriaDescribedbyProperty(Element element, IdReference... value) {
-    Property.DESCRIBEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaDisabledState(Element element, boolean value) {
-    State.DISABLED.set(element, value);
-  }
-
-  @Override
-  public void setAriaDropeffectProperty(Element element, DropeffectValue... value) {
-    Property.DROPEFFECT.set(element, value);
-  }
-
-  @Override
-  public void setAriaFlowtoProperty(Element element, IdReference... value) {
-    Property.FLOWTO.set(element, value);
-  }
-
-  @Override
-  public void setAriaGrabbedState(Element element, GrabbedValue value) {
-    State.GRABBED.set(element, value);
-  }
-
-  @Override
-  public void setAriaHaspopupProperty(Element element, boolean value) {
-    Property.HASPOPUP.set(element, value);
-  }
-
-  @Override
-  public void setAriaHiddenState(Element element, boolean value) {
-    State.HIDDEN.set(element, value);
-  }
-
-  @Override
-  public void setAriaInvalidState(Element element, InvalidValue value) {
-    State.INVALID.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelledbyProperty(Element element, IdReference... value) {
-    Property.LABELLEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelProperty(Element element, String value) {
-    Property.LABEL.set(element, value);
-  }
-
-  @Override
-  public void setAriaLiveProperty(Element element, LiveValue value) {
-    Property.LIVE.set(element, value);
-  }
-
-  @Override
-  public void setAriaOwnsProperty(Element element, IdReference... value) {
-    Property.OWNS.set(element, value);
-  }
-
-  @Override
-  public void setAriaRelevantProperty(Element element, RelevantValue... value) {
-    Property.RELEVANT.set(element, value);
-  }
-
-  @Override
-  public void setTabindexExtraAttribute(Element element, int value) {
-    ExtraAttribute.TABINDEX.set(element, value);
-  }
 }
diff --git a/user/src/com/google/gwt/aria/client/MenuitemradioRole.java b/user/src/com/google/gwt/aria/client/MenuitemradioRole.java
index f905190..2b041c7 100644
--- a/user/src/com/google/gwt/aria/client/MenuitemradioRole.java
+++ b/user/src/com/google/gwt/aria/client/MenuitemradioRole.java
@@ -17,7 +17,6 @@
 // This is auto-generated code.  Do not manually edit! //
 /////////////////////////////////////////////////////////
 
-
 /**
  * A type that represents the <a href="http://www.w3.org/TR/wai-aria/roles#menuitemradio">menuitemradio</a>
  * role in the ARIA specification.
diff --git a/user/src/com/google/gwt/aria/client/MenuitemradioRoleImpl.java b/user/src/com/google/gwt/aria/client/MenuitemradioRoleImpl.java
index 4a8d234..ab50e3a 100644
--- a/user/src/com/google/gwt/aria/client/MenuitemradioRoleImpl.java
+++ b/user/src/com/google/gwt/aria/client/MenuitemradioRoleImpl.java
@@ -28,96 +28,16 @@
   }
 
   @Override
-  public String getAriaAtomicProperty(Element element) {
-    return Property.ATOMIC.get(element);
-  }
-
-  @Override
-  public String getAriaBusyState(Element element) {
-    return State.BUSY.get(element);
-  }
-
-  @Override
   public String getAriaCheckedState(Element element) {
     return State.CHECKED.get(element);
   }
 
   @Override
-  public String getAriaControlsProperty(Element element) {
-    return Property.CONTROLS.get(element);
-  }
-
-  @Override
-  public String getAriaDescribedbyProperty(Element element) {
-    return Property.DESCRIBEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaDisabledState(Element element) {
-    return State.DISABLED.get(element);
-  }
-
-  @Override
-  public String getAriaDropeffectProperty(Element element) {
-    return Property.DROPEFFECT.get(element);
-  }
-
-  @Override
-  public String getAriaFlowtoProperty(Element element) {
-    return Property.FLOWTO.get(element);
-  }
-
-  @Override
-  public String getAriaGrabbedState(Element element) {
-    return State.GRABBED.get(element);
-  }
-
-  @Override
-  public String getAriaHaspopupProperty(Element element) {
-    return Property.HASPOPUP.get(element);
-  }
-
-  @Override
-  public String getAriaHiddenState(Element element) {
-    return State.HIDDEN.get(element);
-  }
-
-  @Override
-  public String getAriaInvalidState(Element element) {
-    return State.INVALID.get(element);
-  }
-
-  @Override
-  public String getAriaLabelledbyProperty(Element element) {
-    return Property.LABELLEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaLabelProperty(Element element) {
-    return Property.LABEL.get(element);
-  }
-
-  @Override
-  public String getAriaLiveProperty(Element element) {
-    return Property.LIVE.get(element);
-  }
-
-  @Override
-  public String getAriaOwnsProperty(Element element) {
-    return Property.OWNS.get(element);
-  }
-
-  @Override
   public String getAriaPosinsetProperty(Element element) {
     return Property.POSINSET.get(element);
   }
 
   @Override
-  public String getAriaRelevantProperty(Element element) {
-    return Property.RELEVANT.get(element);
-  }
-
-  @Override
   public String getAriaSelectedState(Element element) {
     return State.SELECTED.get(element);
   }
@@ -128,101 +48,16 @@
   }
 
   @Override
-  public String getTabindexExtraAttribute(Element element) {
-    return ExtraAttribute.TABINDEX.get(element);
-  }
-
-  @Override
-  public void removeAriaAtomicProperty(Element element) {
-    Property.ATOMIC.remove(element);
-  }
-
-  @Override
-  public void removeAriaBusyState(Element element) {
-    State.BUSY.remove(element);
-  }
-
-  @Override
   public void removeAriaCheckedState(Element element) {
     State.CHECKED.remove(element);
   }
 
   @Override
-  public void removeAriaControlsProperty(Element element) {
-    Property.CONTROLS.remove(element);
-  }
-
-  @Override
-  public void removeAriaDescribedbyProperty(Element element) {
-    Property.DESCRIBEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaDisabledState(Element element) {
-    State.DISABLED.remove(element);
-  }
-
-  @Override
-  public void removeAriaDropeffectProperty(Element element) {
-    Property.DROPEFFECT.remove(element);
-  }
-
-  @Override
-  public void removeAriaFlowtoProperty(Element element) {
-    Property.FLOWTO.remove(element);
-  }
-
-  @Override
-  public void removeAriaGrabbedState(Element element) {
-    State.GRABBED.remove(element);
-  }
-
-  @Override
-  public void removeAriaHaspopupProperty(Element element) {
-    Property.HASPOPUP.remove(element);
-  }
-
-  @Override
-  public void removeAriaHiddenState(Element element) {
-    State.HIDDEN.remove(element);
-  }
-
-  @Override
-  public void removeAriaInvalidState(Element element) {
-    State.INVALID.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelledbyProperty(Element element) {
-    Property.LABELLEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelProperty(Element element) {
-    Property.LABEL.remove(element);
-  }
-
-  @Override
-  public void removeAriaLiveProperty(Element element) {
-    Property.LIVE.remove(element);
-  }
-
-  @Override
-  public void removeAriaOwnsProperty(Element element) {
-    Property.OWNS.remove(element);
-  }
-
-  @Override
   public void removeAriaPosinsetProperty(Element element) {
     Property.POSINSET.remove(element);
   }
 
   @Override
-  public void removeAriaRelevantProperty(Element element) {
-    Property.RELEVANT.remove(element);
-  }
-
-  @Override
   public void removeAriaSelectedState(Element element) {
     State.SELECTED.remove(element);
   }
@@ -233,101 +68,16 @@
   }
 
   @Override
-  public void removeTabindexExtraAttribute(Element element) {
-    ExtraAttribute.TABINDEX.remove(element);
-  }
-
-  @Override
-  public void setAriaAtomicProperty(Element element, boolean value) {
-    Property.ATOMIC.set(element, value);
-  }
-
-  @Override
-  public void setAriaBusyState(Element element, boolean value) {
-    State.BUSY.set(element, value);
-  }
-
-  @Override
   public void setAriaCheckedState(Element element, CheckedValue value) {
     State.CHECKED.set(element, value);
   }
 
   @Override
-  public void setAriaControlsProperty(Element element, IdReference... value) {
-    Property.CONTROLS.set(element, value);
-  }
-
-  @Override
-  public void setAriaDescribedbyProperty(Element element, IdReference... value) {
-    Property.DESCRIBEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaDisabledState(Element element, boolean value) {
-    State.DISABLED.set(element, value);
-  }
-
-  @Override
-  public void setAriaDropeffectProperty(Element element, DropeffectValue... value) {
-    Property.DROPEFFECT.set(element, value);
-  }
-
-  @Override
-  public void setAriaFlowtoProperty(Element element, IdReference... value) {
-    Property.FLOWTO.set(element, value);
-  }
-
-  @Override
-  public void setAriaGrabbedState(Element element, GrabbedValue value) {
-    State.GRABBED.set(element, value);
-  }
-
-  @Override
-  public void setAriaHaspopupProperty(Element element, boolean value) {
-    Property.HASPOPUP.set(element, value);
-  }
-
-  @Override
-  public void setAriaHiddenState(Element element, boolean value) {
-    State.HIDDEN.set(element, value);
-  }
-
-  @Override
-  public void setAriaInvalidState(Element element, InvalidValue value) {
-    State.INVALID.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelledbyProperty(Element element, IdReference... value) {
-    Property.LABELLEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelProperty(Element element, String value) {
-    Property.LABEL.set(element, value);
-  }
-
-  @Override
-  public void setAriaLiveProperty(Element element, LiveValue value) {
-    Property.LIVE.set(element, value);
-  }
-
-  @Override
-  public void setAriaOwnsProperty(Element element, IdReference... value) {
-    Property.OWNS.set(element, value);
-  }
-
-  @Override
   public void setAriaPosinsetProperty(Element element, int value) {
     Property.POSINSET.set(element, value);
   }
 
   @Override
-  public void setAriaRelevantProperty(Element element, RelevantValue... value) {
-    Property.RELEVANT.set(element, value);
-  }
-
-  @Override
   public void setAriaSelectedState(Element element, SelectedValue value) {
     State.SELECTED.set(element, value);
   }
@@ -336,9 +86,4 @@
   public void setAriaSetsizeProperty(Element element, int value) {
     Property.SETSIZE.set(element, value);
   }
-
-  @Override
-  public void setTabindexExtraAttribute(Element element, int value) {
-    ExtraAttribute.TABINDEX.set(element, value);
-  }
 }
diff --git a/user/src/com/google/gwt/aria/client/NavigationRole.java b/user/src/com/google/gwt/aria/client/NavigationRole.java
index e2859f0..ea70244 100644
--- a/user/src/com/google/gwt/aria/client/NavigationRole.java
+++ b/user/src/com/google/gwt/aria/client/NavigationRole.java
@@ -17,7 +17,6 @@
 // This is auto-generated code.  Do not manually edit! //
 /////////////////////////////////////////////////////////
 
-
 /**
  * A type that represents the <a href="http://www.w3.org/TR/wai-aria/roles#navigation">navigation</a>
  * role in the ARIA specification.
diff --git a/user/src/com/google/gwt/aria/client/NavigationRoleImpl.java b/user/src/com/google/gwt/aria/client/NavigationRoleImpl.java
index 192095e..88bcd54 100644
--- a/user/src/com/google/gwt/aria/client/NavigationRoleImpl.java
+++ b/user/src/com/google/gwt/aria/client/NavigationRoleImpl.java
@@ -28,272 +28,17 @@
   }
 
   @Override
-  public String getAriaAtomicProperty(Element element) {
-    return Property.ATOMIC.get(element);
-  }
-
-  @Override
-  public String getAriaBusyState(Element element) {
-    return State.BUSY.get(element);
-  }
-
-  @Override
-  public String getAriaControlsProperty(Element element) {
-    return Property.CONTROLS.get(element);
-  }
-
-  @Override
-  public String getAriaDescribedbyProperty(Element element) {
-    return Property.DESCRIBEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaDisabledState(Element element) {
-    return State.DISABLED.get(element);
-  }
-
-  @Override
-  public String getAriaDropeffectProperty(Element element) {
-    return Property.DROPEFFECT.get(element);
-  }
-
-  @Override
   public String getAriaExpandedState(Element element) {
     return State.EXPANDED.get(element);
   }
 
   @Override
-  public String getAriaFlowtoProperty(Element element) {
-    return Property.FLOWTO.get(element);
-  }
-
-  @Override
-  public String getAriaGrabbedState(Element element) {
-    return State.GRABBED.get(element);
-  }
-
-  @Override
-  public String getAriaHaspopupProperty(Element element) {
-    return Property.HASPOPUP.get(element);
-  }
-
-  @Override
-  public String getAriaHiddenState(Element element) {
-    return State.HIDDEN.get(element);
-  }
-
-  @Override
-  public String getAriaInvalidState(Element element) {
-    return State.INVALID.get(element);
-  }
-
-  @Override
-  public String getAriaLabelledbyProperty(Element element) {
-    return Property.LABELLEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaLabelProperty(Element element) {
-    return Property.LABEL.get(element);
-  }
-
-  @Override
-  public String getAriaLiveProperty(Element element) {
-    return Property.LIVE.get(element);
-  }
-
-  @Override
-  public String getAriaOwnsProperty(Element element) {
-    return Property.OWNS.get(element);
-  }
-
-  @Override
-  public String getAriaRelevantProperty(Element element) {
-    return Property.RELEVANT.get(element);
-  }
-
-  @Override
-  public String getTabindexExtraAttribute(Element element) {
-    return ExtraAttribute.TABINDEX.get(element);
-  }
-
-  @Override
-  public void removeAriaAtomicProperty(Element element) {
-    Property.ATOMIC.remove(element);
-  }
-
-  @Override
-  public void removeAriaBusyState(Element element) {
-    State.BUSY.remove(element);
-  }
-
-  @Override
-  public void removeAriaControlsProperty(Element element) {
-    Property.CONTROLS.remove(element);
-  }
-
-  @Override
-  public void removeAriaDescribedbyProperty(Element element) {
-    Property.DESCRIBEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaDisabledState(Element element) {
-    State.DISABLED.remove(element);
-  }
-
-  @Override
-  public void removeAriaDropeffectProperty(Element element) {
-    Property.DROPEFFECT.remove(element);
-  }
-
-  @Override
   public void removeAriaExpandedState(Element element) {
     State.EXPANDED.remove(element);
   }
 
   @Override
-  public void removeAriaFlowtoProperty(Element element) {
-    Property.FLOWTO.remove(element);
-  }
-
-  @Override
-  public void removeAriaGrabbedState(Element element) {
-    State.GRABBED.remove(element);
-  }
-
-  @Override
-  public void removeAriaHaspopupProperty(Element element) {
-    Property.HASPOPUP.remove(element);
-  }
-
-  @Override
-  public void removeAriaHiddenState(Element element) {
-    State.HIDDEN.remove(element);
-  }
-
-  @Override
-  public void removeAriaInvalidState(Element element) {
-    State.INVALID.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelledbyProperty(Element element) {
-    Property.LABELLEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelProperty(Element element) {
-    Property.LABEL.remove(element);
-  }
-
-  @Override
-  public void removeAriaLiveProperty(Element element) {
-    Property.LIVE.remove(element);
-  }
-
-  @Override
-  public void removeAriaOwnsProperty(Element element) {
-    Property.OWNS.remove(element);
-  }
-
-  @Override
-  public void removeAriaRelevantProperty(Element element) {
-    Property.RELEVANT.remove(element);
-  }
-
-  @Override
-  public void removeTabindexExtraAttribute(Element element) {
-    ExtraAttribute.TABINDEX.remove(element);
-  }
-
-  @Override
-  public void setAriaAtomicProperty(Element element, boolean value) {
-    Property.ATOMIC.set(element, value);
-  }
-
-  @Override
-  public void setAriaBusyState(Element element, boolean value) {
-    State.BUSY.set(element, value);
-  }
-
-  @Override
-  public void setAriaControlsProperty(Element element, IdReference... value) {
-    Property.CONTROLS.set(element, value);
-  }
-
-  @Override
-  public void setAriaDescribedbyProperty(Element element, IdReference... value) {
-    Property.DESCRIBEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaDisabledState(Element element, boolean value) {
-    State.DISABLED.set(element, value);
-  }
-
-  @Override
-  public void setAriaDropeffectProperty(Element element, DropeffectValue... value) {
-    Property.DROPEFFECT.set(element, value);
-  }
-
-  @Override
   public void setAriaExpandedState(Element element, ExpandedValue value) {
     State.EXPANDED.set(element, value);
   }
-
-  @Override
-  public void setAriaFlowtoProperty(Element element, IdReference... value) {
-    Property.FLOWTO.set(element, value);
-  }
-
-  @Override
-  public void setAriaGrabbedState(Element element, GrabbedValue value) {
-    State.GRABBED.set(element, value);
-  }
-
-  @Override
-  public void setAriaHaspopupProperty(Element element, boolean value) {
-    Property.HASPOPUP.set(element, value);
-  }
-
-  @Override
-  public void setAriaHiddenState(Element element, boolean value) {
-    State.HIDDEN.set(element, value);
-  }
-
-  @Override
-  public void setAriaInvalidState(Element element, InvalidValue value) {
-    State.INVALID.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelledbyProperty(Element element, IdReference... value) {
-    Property.LABELLEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelProperty(Element element, String value) {
-    Property.LABEL.set(element, value);
-  }
-
-  @Override
-  public void setAriaLiveProperty(Element element, LiveValue value) {
-    Property.LIVE.set(element, value);
-  }
-
-  @Override
-  public void setAriaOwnsProperty(Element element, IdReference... value) {
-    Property.OWNS.set(element, value);
-  }
-
-  @Override
-  public void setAriaRelevantProperty(Element element, RelevantValue... value) {
-    Property.RELEVANT.set(element, value);
-  }
-
-  @Override
-  public void setTabindexExtraAttribute(Element element, int value) {
-    ExtraAttribute.TABINDEX.set(element, value);
-  }
 }
diff --git a/user/src/com/google/gwt/aria/client/NoteRole.java b/user/src/com/google/gwt/aria/client/NoteRole.java
index 1a85552..56acef3 100644
--- a/user/src/com/google/gwt/aria/client/NoteRole.java
+++ b/user/src/com/google/gwt/aria/client/NoteRole.java
@@ -17,7 +17,6 @@
 // This is auto-generated code.  Do not manually edit! //
 /////////////////////////////////////////////////////////
 
-
 /**
  * A type that represents the <a href="http://www.w3.org/TR/wai-aria/roles#note">note</a>
  * role in the ARIA specification.
diff --git a/user/src/com/google/gwt/aria/client/NoteRoleImpl.java b/user/src/com/google/gwt/aria/client/NoteRoleImpl.java
index c58cdae..26c4391 100644
--- a/user/src/com/google/gwt/aria/client/NoteRoleImpl.java
+++ b/user/src/com/google/gwt/aria/client/NoteRoleImpl.java
@@ -28,272 +28,17 @@
   }
 
   @Override
-  public String getAriaAtomicProperty(Element element) {
-    return Property.ATOMIC.get(element);
-  }
-
-  @Override
-  public String getAriaBusyState(Element element) {
-    return State.BUSY.get(element);
-  }
-
-  @Override
-  public String getAriaControlsProperty(Element element) {
-    return Property.CONTROLS.get(element);
-  }
-
-  @Override
-  public String getAriaDescribedbyProperty(Element element) {
-    return Property.DESCRIBEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaDisabledState(Element element) {
-    return State.DISABLED.get(element);
-  }
-
-  @Override
-  public String getAriaDropeffectProperty(Element element) {
-    return Property.DROPEFFECT.get(element);
-  }
-
-  @Override
   public String getAriaExpandedState(Element element) {
     return State.EXPANDED.get(element);
   }
 
   @Override
-  public String getAriaFlowtoProperty(Element element) {
-    return Property.FLOWTO.get(element);
-  }
-
-  @Override
-  public String getAriaGrabbedState(Element element) {
-    return State.GRABBED.get(element);
-  }
-
-  @Override
-  public String getAriaHaspopupProperty(Element element) {
-    return Property.HASPOPUP.get(element);
-  }
-
-  @Override
-  public String getAriaHiddenState(Element element) {
-    return State.HIDDEN.get(element);
-  }
-
-  @Override
-  public String getAriaInvalidState(Element element) {
-    return State.INVALID.get(element);
-  }
-
-  @Override
-  public String getAriaLabelledbyProperty(Element element) {
-    return Property.LABELLEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaLabelProperty(Element element) {
-    return Property.LABEL.get(element);
-  }
-
-  @Override
-  public String getAriaLiveProperty(Element element) {
-    return Property.LIVE.get(element);
-  }
-
-  @Override
-  public String getAriaOwnsProperty(Element element) {
-    return Property.OWNS.get(element);
-  }
-
-  @Override
-  public String getAriaRelevantProperty(Element element) {
-    return Property.RELEVANT.get(element);
-  }
-
-  @Override
-  public String getTabindexExtraAttribute(Element element) {
-    return ExtraAttribute.TABINDEX.get(element);
-  }
-
-  @Override
-  public void removeAriaAtomicProperty(Element element) {
-    Property.ATOMIC.remove(element);
-  }
-
-  @Override
-  public void removeAriaBusyState(Element element) {
-    State.BUSY.remove(element);
-  }
-
-  @Override
-  public void removeAriaControlsProperty(Element element) {
-    Property.CONTROLS.remove(element);
-  }
-
-  @Override
-  public void removeAriaDescribedbyProperty(Element element) {
-    Property.DESCRIBEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaDisabledState(Element element) {
-    State.DISABLED.remove(element);
-  }
-
-  @Override
-  public void removeAriaDropeffectProperty(Element element) {
-    Property.DROPEFFECT.remove(element);
-  }
-
-  @Override
   public void removeAriaExpandedState(Element element) {
     State.EXPANDED.remove(element);
   }
 
   @Override
-  public void removeAriaFlowtoProperty(Element element) {
-    Property.FLOWTO.remove(element);
-  }
-
-  @Override
-  public void removeAriaGrabbedState(Element element) {
-    State.GRABBED.remove(element);
-  }
-
-  @Override
-  public void removeAriaHaspopupProperty(Element element) {
-    Property.HASPOPUP.remove(element);
-  }
-
-  @Override
-  public void removeAriaHiddenState(Element element) {
-    State.HIDDEN.remove(element);
-  }
-
-  @Override
-  public void removeAriaInvalidState(Element element) {
-    State.INVALID.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelledbyProperty(Element element) {
-    Property.LABELLEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelProperty(Element element) {
-    Property.LABEL.remove(element);
-  }
-
-  @Override
-  public void removeAriaLiveProperty(Element element) {
-    Property.LIVE.remove(element);
-  }
-
-  @Override
-  public void removeAriaOwnsProperty(Element element) {
-    Property.OWNS.remove(element);
-  }
-
-  @Override
-  public void removeAriaRelevantProperty(Element element) {
-    Property.RELEVANT.remove(element);
-  }
-
-  @Override
-  public void removeTabindexExtraAttribute(Element element) {
-    ExtraAttribute.TABINDEX.remove(element);
-  }
-
-  @Override
-  public void setAriaAtomicProperty(Element element, boolean value) {
-    Property.ATOMIC.set(element, value);
-  }
-
-  @Override
-  public void setAriaBusyState(Element element, boolean value) {
-    State.BUSY.set(element, value);
-  }
-
-  @Override
-  public void setAriaControlsProperty(Element element, IdReference... value) {
-    Property.CONTROLS.set(element, value);
-  }
-
-  @Override
-  public void setAriaDescribedbyProperty(Element element, IdReference... value) {
-    Property.DESCRIBEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaDisabledState(Element element, boolean value) {
-    State.DISABLED.set(element, value);
-  }
-
-  @Override
-  public void setAriaDropeffectProperty(Element element, DropeffectValue... value) {
-    Property.DROPEFFECT.set(element, value);
-  }
-
-  @Override
   public void setAriaExpandedState(Element element, ExpandedValue value) {
     State.EXPANDED.set(element, value);
   }
-
-  @Override
-  public void setAriaFlowtoProperty(Element element, IdReference... value) {
-    Property.FLOWTO.set(element, value);
-  }
-
-  @Override
-  public void setAriaGrabbedState(Element element, GrabbedValue value) {
-    State.GRABBED.set(element, value);
-  }
-
-  @Override
-  public void setAriaHaspopupProperty(Element element, boolean value) {
-    Property.HASPOPUP.set(element, value);
-  }
-
-  @Override
-  public void setAriaHiddenState(Element element, boolean value) {
-    State.HIDDEN.set(element, value);
-  }
-
-  @Override
-  public void setAriaInvalidState(Element element, InvalidValue value) {
-    State.INVALID.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelledbyProperty(Element element, IdReference... value) {
-    Property.LABELLEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelProperty(Element element, String value) {
-    Property.LABEL.set(element, value);
-  }
-
-  @Override
-  public void setAriaLiveProperty(Element element, LiveValue value) {
-    Property.LIVE.set(element, value);
-  }
-
-  @Override
-  public void setAriaOwnsProperty(Element element, IdReference... value) {
-    Property.OWNS.set(element, value);
-  }
-
-  @Override
-  public void setAriaRelevantProperty(Element element, RelevantValue... value) {
-    Property.RELEVANT.set(element, value);
-  }
-
-  @Override
-  public void setTabindexExtraAttribute(Element element, int value) {
-    ExtraAttribute.TABINDEX.set(element, value);
-  }
 }
diff --git a/user/src/com/google/gwt/aria/client/OptionRoleImpl.java b/user/src/com/google/gwt/aria/client/OptionRoleImpl.java
index c7b32ae..d5f0151 100644
--- a/user/src/com/google/gwt/aria/client/OptionRoleImpl.java
+++ b/user/src/com/google/gwt/aria/client/OptionRoleImpl.java
@@ -28,96 +28,16 @@
   }
 
   @Override
-  public String getAriaAtomicProperty(Element element) {
-    return Property.ATOMIC.get(element);
-  }
-
-  @Override
-  public String getAriaBusyState(Element element) {
-    return State.BUSY.get(element);
-  }
-
-  @Override
   public String getAriaCheckedState(Element element) {
     return State.CHECKED.get(element);
   }
 
   @Override
-  public String getAriaControlsProperty(Element element) {
-    return Property.CONTROLS.get(element);
-  }
-
-  @Override
-  public String getAriaDescribedbyProperty(Element element) {
-    return Property.DESCRIBEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaDisabledState(Element element) {
-    return State.DISABLED.get(element);
-  }
-
-  @Override
-  public String getAriaDropeffectProperty(Element element) {
-    return Property.DROPEFFECT.get(element);
-  }
-
-  @Override
-  public String getAriaFlowtoProperty(Element element) {
-    return Property.FLOWTO.get(element);
-  }
-
-  @Override
-  public String getAriaGrabbedState(Element element) {
-    return State.GRABBED.get(element);
-  }
-
-  @Override
-  public String getAriaHaspopupProperty(Element element) {
-    return Property.HASPOPUP.get(element);
-  }
-
-  @Override
-  public String getAriaHiddenState(Element element) {
-    return State.HIDDEN.get(element);
-  }
-
-  @Override
-  public String getAriaInvalidState(Element element) {
-    return State.INVALID.get(element);
-  }
-
-  @Override
-  public String getAriaLabelledbyProperty(Element element) {
-    return Property.LABELLEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaLabelProperty(Element element) {
-    return Property.LABEL.get(element);
-  }
-
-  @Override
-  public String getAriaLiveProperty(Element element) {
-    return Property.LIVE.get(element);
-  }
-
-  @Override
-  public String getAriaOwnsProperty(Element element) {
-    return Property.OWNS.get(element);
-  }
-
-  @Override
   public String getAriaPosinsetProperty(Element element) {
     return Property.POSINSET.get(element);
   }
 
   @Override
-  public String getAriaRelevantProperty(Element element) {
-    return Property.RELEVANT.get(element);
-  }
-
-  @Override
   public String getAriaSelectedState(Element element) {
     return State.SELECTED.get(element);
   }
@@ -128,101 +48,16 @@
   }
 
   @Override
-  public String getTabindexExtraAttribute(Element element) {
-    return ExtraAttribute.TABINDEX.get(element);
-  }
-
-  @Override
-  public void removeAriaAtomicProperty(Element element) {
-    Property.ATOMIC.remove(element);
-  }
-
-  @Override
-  public void removeAriaBusyState(Element element) {
-    State.BUSY.remove(element);
-  }
-
-  @Override
   public void removeAriaCheckedState(Element element) {
     State.CHECKED.remove(element);
   }
 
   @Override
-  public void removeAriaControlsProperty(Element element) {
-    Property.CONTROLS.remove(element);
-  }
-
-  @Override
-  public void removeAriaDescribedbyProperty(Element element) {
-    Property.DESCRIBEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaDisabledState(Element element) {
-    State.DISABLED.remove(element);
-  }
-
-  @Override
-  public void removeAriaDropeffectProperty(Element element) {
-    Property.DROPEFFECT.remove(element);
-  }
-
-  @Override
-  public void removeAriaFlowtoProperty(Element element) {
-    Property.FLOWTO.remove(element);
-  }
-
-  @Override
-  public void removeAriaGrabbedState(Element element) {
-    State.GRABBED.remove(element);
-  }
-
-  @Override
-  public void removeAriaHaspopupProperty(Element element) {
-    Property.HASPOPUP.remove(element);
-  }
-
-  @Override
-  public void removeAriaHiddenState(Element element) {
-    State.HIDDEN.remove(element);
-  }
-
-  @Override
-  public void removeAriaInvalidState(Element element) {
-    State.INVALID.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelledbyProperty(Element element) {
-    Property.LABELLEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelProperty(Element element) {
-    Property.LABEL.remove(element);
-  }
-
-  @Override
-  public void removeAriaLiveProperty(Element element) {
-    Property.LIVE.remove(element);
-  }
-
-  @Override
-  public void removeAriaOwnsProperty(Element element) {
-    Property.OWNS.remove(element);
-  }
-
-  @Override
   public void removeAriaPosinsetProperty(Element element) {
     Property.POSINSET.remove(element);
   }
 
   @Override
-  public void removeAriaRelevantProperty(Element element) {
-    Property.RELEVANT.remove(element);
-  }
-
-  @Override
   public void removeAriaSelectedState(Element element) {
     State.SELECTED.remove(element);
   }
@@ -233,101 +68,16 @@
   }
 
   @Override
-  public void removeTabindexExtraAttribute(Element element) {
-    ExtraAttribute.TABINDEX.remove(element);
-  }
-
-  @Override
-  public void setAriaAtomicProperty(Element element, boolean value) {
-    Property.ATOMIC.set(element, value);
-  }
-
-  @Override
-  public void setAriaBusyState(Element element, boolean value) {
-    State.BUSY.set(element, value);
-  }
-
-  @Override
   public void setAriaCheckedState(Element element, CheckedValue value) {
     State.CHECKED.set(element, value);
   }
 
   @Override
-  public void setAriaControlsProperty(Element element, IdReference... value) {
-    Property.CONTROLS.set(element, value);
-  }
-
-  @Override
-  public void setAriaDescribedbyProperty(Element element, IdReference... value) {
-    Property.DESCRIBEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaDisabledState(Element element, boolean value) {
-    State.DISABLED.set(element, value);
-  }
-
-  @Override
-  public void setAriaDropeffectProperty(Element element, DropeffectValue... value) {
-    Property.DROPEFFECT.set(element, value);
-  }
-
-  @Override
-  public void setAriaFlowtoProperty(Element element, IdReference... value) {
-    Property.FLOWTO.set(element, value);
-  }
-
-  @Override
-  public void setAriaGrabbedState(Element element, GrabbedValue value) {
-    State.GRABBED.set(element, value);
-  }
-
-  @Override
-  public void setAriaHaspopupProperty(Element element, boolean value) {
-    Property.HASPOPUP.set(element, value);
-  }
-
-  @Override
-  public void setAriaHiddenState(Element element, boolean value) {
-    State.HIDDEN.set(element, value);
-  }
-
-  @Override
-  public void setAriaInvalidState(Element element, InvalidValue value) {
-    State.INVALID.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelledbyProperty(Element element, IdReference... value) {
-    Property.LABELLEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelProperty(Element element, String value) {
-    Property.LABEL.set(element, value);
-  }
-
-  @Override
-  public void setAriaLiveProperty(Element element, LiveValue value) {
-    Property.LIVE.set(element, value);
-  }
-
-  @Override
-  public void setAriaOwnsProperty(Element element, IdReference... value) {
-    Property.OWNS.set(element, value);
-  }
-
-  @Override
   public void setAriaPosinsetProperty(Element element, int value) {
     Property.POSINSET.set(element, value);
   }
 
   @Override
-  public void setAriaRelevantProperty(Element element, RelevantValue... value) {
-    Property.RELEVANT.set(element, value);
-  }
-
-  @Override
   public void setAriaSelectedState(Element element, SelectedValue value) {
     State.SELECTED.set(element, value);
   }
@@ -336,9 +86,4 @@
   public void setAriaSetsizeProperty(Element element, int value) {
     Property.SETSIZE.set(element, value);
   }
-
-  @Override
-  public void setTabindexExtraAttribute(Element element, int value) {
-    ExtraAttribute.TABINDEX.set(element, value);
-  }
 }
diff --git a/user/src/com/google/gwt/aria/client/PresentationRole.java b/user/src/com/google/gwt/aria/client/PresentationRole.java
index c2b0df4..025801a 100644
--- a/user/src/com/google/gwt/aria/client/PresentationRole.java
+++ b/user/src/com/google/gwt/aria/client/PresentationRole.java
@@ -17,7 +17,6 @@
 // This is auto-generated code.  Do not manually edit! //
 /////////////////////////////////////////////////////////
 
-
 /**
  * A type that represents the <a href="http://www.w3.org/TR/wai-aria/roles#presentation">presentation</a>
  * role in the ARIA specification.
diff --git a/user/src/com/google/gwt/aria/client/PresentationRoleImpl.java b/user/src/com/google/gwt/aria/client/PresentationRoleImpl.java
index 56badbb..9c1f946 100644
--- a/user/src/com/google/gwt/aria/client/PresentationRoleImpl.java
+++ b/user/src/com/google/gwt/aria/client/PresentationRoleImpl.java
@@ -17,8 +17,6 @@
 // This is auto-generated code.  Do not manually edit! //
 /////////////////////////////////////////////////////////
 
-import com.google.gwt.dom.client.Element;
-
 /**
  * <p>Implements {@link PresentationRole}.</p>
  */
@@ -27,258 +25,4 @@
     super(roleName);
   }
 
-  @Override
-  public String getAriaAtomicProperty(Element element) {
-    return Property.ATOMIC.get(element);
-  }
-
-  @Override
-  public String getAriaBusyState(Element element) {
-    return State.BUSY.get(element);
-  }
-
-  @Override
-  public String getAriaControlsProperty(Element element) {
-    return Property.CONTROLS.get(element);
-  }
-
-  @Override
-  public String getAriaDescribedbyProperty(Element element) {
-    return Property.DESCRIBEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaDisabledState(Element element) {
-    return State.DISABLED.get(element);
-  }
-
-  @Override
-  public String getAriaDropeffectProperty(Element element) {
-    return Property.DROPEFFECT.get(element);
-  }
-
-  @Override
-  public String getAriaFlowtoProperty(Element element) {
-    return Property.FLOWTO.get(element);
-  }
-
-  @Override
-  public String getAriaGrabbedState(Element element) {
-    return State.GRABBED.get(element);
-  }
-
-  @Override
-  public String getAriaHaspopupProperty(Element element) {
-    return Property.HASPOPUP.get(element);
-  }
-
-  @Override
-  public String getAriaHiddenState(Element element) {
-    return State.HIDDEN.get(element);
-  }
-
-  @Override
-  public String getAriaInvalidState(Element element) {
-    return State.INVALID.get(element);
-  }
-
-  @Override
-  public String getAriaLabelledbyProperty(Element element) {
-    return Property.LABELLEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaLabelProperty(Element element) {
-    return Property.LABEL.get(element);
-  }
-
-  @Override
-  public String getAriaLiveProperty(Element element) {
-    return Property.LIVE.get(element);
-  }
-
-  @Override
-  public String getAriaOwnsProperty(Element element) {
-    return Property.OWNS.get(element);
-  }
-
-  @Override
-  public String getAriaRelevantProperty(Element element) {
-    return Property.RELEVANT.get(element);
-  }
-
-  @Override
-  public String getTabindexExtraAttribute(Element element) {
-    return ExtraAttribute.TABINDEX.get(element);
-  }
-
-  @Override
-  public void removeAriaAtomicProperty(Element element) {
-    Property.ATOMIC.remove(element);
-  }
-
-  @Override
-  public void removeAriaBusyState(Element element) {
-    State.BUSY.remove(element);
-  }
-
-  @Override
-  public void removeAriaControlsProperty(Element element) {
-    Property.CONTROLS.remove(element);
-  }
-
-  @Override
-  public void removeAriaDescribedbyProperty(Element element) {
-    Property.DESCRIBEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaDisabledState(Element element) {
-    State.DISABLED.remove(element);
-  }
-
-  @Override
-  public void removeAriaDropeffectProperty(Element element) {
-    Property.DROPEFFECT.remove(element);
-  }
-
-  @Override
-  public void removeAriaFlowtoProperty(Element element) {
-    Property.FLOWTO.remove(element);
-  }
-
-  @Override
-  public void removeAriaGrabbedState(Element element) {
-    State.GRABBED.remove(element);
-  }
-
-  @Override
-  public void removeAriaHaspopupProperty(Element element) {
-    Property.HASPOPUP.remove(element);
-  }
-
-  @Override
-  public void removeAriaHiddenState(Element element) {
-    State.HIDDEN.remove(element);
-  }
-
-  @Override
-  public void removeAriaInvalidState(Element element) {
-    State.INVALID.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelledbyProperty(Element element) {
-    Property.LABELLEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelProperty(Element element) {
-    Property.LABEL.remove(element);
-  }
-
-  @Override
-  public void removeAriaLiveProperty(Element element) {
-    Property.LIVE.remove(element);
-  }
-
-  @Override
-  public void removeAriaOwnsProperty(Element element) {
-    Property.OWNS.remove(element);
-  }
-
-  @Override
-  public void removeAriaRelevantProperty(Element element) {
-    Property.RELEVANT.remove(element);
-  }
-
-  @Override
-  public void removeTabindexExtraAttribute(Element element) {
-    ExtraAttribute.TABINDEX.remove(element);
-  }
-
-  @Override
-  public void setAriaAtomicProperty(Element element, boolean value) {
-    Property.ATOMIC.set(element, value);
-  }
-
-  @Override
-  public void setAriaBusyState(Element element, boolean value) {
-    State.BUSY.set(element, value);
-  }
-
-  @Override
-  public void setAriaControlsProperty(Element element, IdReference... value) {
-    Property.CONTROLS.set(element, value);
-  }
-
-  @Override
-  public void setAriaDescribedbyProperty(Element element, IdReference... value) {
-    Property.DESCRIBEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaDisabledState(Element element, boolean value) {
-    State.DISABLED.set(element, value);
-  }
-
-  @Override
-  public void setAriaDropeffectProperty(Element element, DropeffectValue... value) {
-    Property.DROPEFFECT.set(element, value);
-  }
-
-  @Override
-  public void setAriaFlowtoProperty(Element element, IdReference... value) {
-    Property.FLOWTO.set(element, value);
-  }
-
-  @Override
-  public void setAriaGrabbedState(Element element, GrabbedValue value) {
-    State.GRABBED.set(element, value);
-  }
-
-  @Override
-  public void setAriaHaspopupProperty(Element element, boolean value) {
-    Property.HASPOPUP.set(element, value);
-  }
-
-  @Override
-  public void setAriaHiddenState(Element element, boolean value) {
-    State.HIDDEN.set(element, value);
-  }
-
-  @Override
-  public void setAriaInvalidState(Element element, InvalidValue value) {
-    State.INVALID.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelledbyProperty(Element element, IdReference... value) {
-    Property.LABELLEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelProperty(Element element, String value) {
-    Property.LABEL.set(element, value);
-  }
-
-  @Override
-  public void setAriaLiveProperty(Element element, LiveValue value) {
-    Property.LIVE.set(element, value);
-  }
-
-  @Override
-  public void setAriaOwnsProperty(Element element, IdReference... value) {
-    Property.OWNS.set(element, value);
-  }
-
-  @Override
-  public void setAriaRelevantProperty(Element element, RelevantValue... value) {
-    Property.RELEVANT.set(element, value);
-  }
-
-  @Override
-  public void setTabindexExtraAttribute(Element element, int value) {
-    ExtraAttribute.TABINDEX.set(element, value);
-  }
 }
diff --git a/user/src/com/google/gwt/aria/client/ProgressbarRole.java b/user/src/com/google/gwt/aria/client/ProgressbarRole.java
index 2c68d6b..57139ce 100644
--- a/user/src/com/google/gwt/aria/client/ProgressbarRole.java
+++ b/user/src/com/google/gwt/aria/client/ProgressbarRole.java
@@ -17,7 +17,6 @@
 // This is auto-generated code.  Do not manually edit! //
 /////////////////////////////////////////////////////////
 
-
 /**
  * A type that represents the <a href="http://www.w3.org/TR/wai-aria/roles#progressbar">progressbar</a>
  * role in the ARIA specification.
diff --git a/user/src/com/google/gwt/aria/client/ProgressbarRoleImpl.java b/user/src/com/google/gwt/aria/client/ProgressbarRoleImpl.java
index 5170fa2..49e9b3a 100644
--- a/user/src/com/google/gwt/aria/client/ProgressbarRoleImpl.java
+++ b/user/src/com/google/gwt/aria/client/ProgressbarRoleImpl.java
@@ -28,86 +28,6 @@
   }
 
   @Override
-  public String getAriaAtomicProperty(Element element) {
-    return Property.ATOMIC.get(element);
-  }
-
-  @Override
-  public String getAriaBusyState(Element element) {
-    return State.BUSY.get(element);
-  }
-
-  @Override
-  public String getAriaControlsProperty(Element element) {
-    return Property.CONTROLS.get(element);
-  }
-
-  @Override
-  public String getAriaDescribedbyProperty(Element element) {
-    return Property.DESCRIBEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaDisabledState(Element element) {
-    return State.DISABLED.get(element);
-  }
-
-  @Override
-  public String getAriaDropeffectProperty(Element element) {
-    return Property.DROPEFFECT.get(element);
-  }
-
-  @Override
-  public String getAriaFlowtoProperty(Element element) {
-    return Property.FLOWTO.get(element);
-  }
-
-  @Override
-  public String getAriaGrabbedState(Element element) {
-    return State.GRABBED.get(element);
-  }
-
-  @Override
-  public String getAriaHaspopupProperty(Element element) {
-    return Property.HASPOPUP.get(element);
-  }
-
-  @Override
-  public String getAriaHiddenState(Element element) {
-    return State.HIDDEN.get(element);
-  }
-
-  @Override
-  public String getAriaInvalidState(Element element) {
-    return State.INVALID.get(element);
-  }
-
-  @Override
-  public String getAriaLabelledbyProperty(Element element) {
-    return Property.LABELLEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaLabelProperty(Element element) {
-    return Property.LABEL.get(element);
-  }
-
-  @Override
-  public String getAriaLiveProperty(Element element) {
-    return Property.LIVE.get(element);
-  }
-
-  @Override
-  public String getAriaOwnsProperty(Element element) {
-    return Property.OWNS.get(element);
-  }
-
-  @Override
-  public String getAriaRelevantProperty(Element element) {
-    return Property.RELEVANT.get(element);
-  }
-
-  @Override
   public String getAriaValuemaxProperty(Element element) {
     return Property.VALUEMAX.get(element);
   }
@@ -128,91 +48,6 @@
   }
 
   @Override
-  public String getTabindexExtraAttribute(Element element) {
-    return ExtraAttribute.TABINDEX.get(element);
-  }
-
-  @Override
-  public void removeAriaAtomicProperty(Element element) {
-    Property.ATOMIC.remove(element);
-  }
-
-  @Override
-  public void removeAriaBusyState(Element element) {
-    State.BUSY.remove(element);
-  }
-
-  @Override
-  public void removeAriaControlsProperty(Element element) {
-    Property.CONTROLS.remove(element);
-  }
-
-  @Override
-  public void removeAriaDescribedbyProperty(Element element) {
-    Property.DESCRIBEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaDisabledState(Element element) {
-    State.DISABLED.remove(element);
-  }
-
-  @Override
-  public void removeAriaDropeffectProperty(Element element) {
-    Property.DROPEFFECT.remove(element);
-  }
-
-  @Override
-  public void removeAriaFlowtoProperty(Element element) {
-    Property.FLOWTO.remove(element);
-  }
-
-  @Override
-  public void removeAriaGrabbedState(Element element) {
-    State.GRABBED.remove(element);
-  }
-
-  @Override
-  public void removeAriaHaspopupProperty(Element element) {
-    Property.HASPOPUP.remove(element);
-  }
-
-  @Override
-  public void removeAriaHiddenState(Element element) {
-    State.HIDDEN.remove(element);
-  }
-
-  @Override
-  public void removeAriaInvalidState(Element element) {
-    State.INVALID.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelledbyProperty(Element element) {
-    Property.LABELLEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelProperty(Element element) {
-    Property.LABEL.remove(element);
-  }
-
-  @Override
-  public void removeAriaLiveProperty(Element element) {
-    Property.LIVE.remove(element);
-  }
-
-  @Override
-  public void removeAriaOwnsProperty(Element element) {
-    Property.OWNS.remove(element);
-  }
-
-  @Override
-  public void removeAriaRelevantProperty(Element element) {
-    Property.RELEVANT.remove(element);
-  }
-
-  @Override
   public void removeAriaValuemaxProperty(Element element) {
     Property.VALUEMAX.remove(element);
   }
@@ -233,91 +68,6 @@
   }
 
   @Override
-  public void removeTabindexExtraAttribute(Element element) {
-    ExtraAttribute.TABINDEX.remove(element);
-  }
-
-  @Override
-  public void setAriaAtomicProperty(Element element, boolean value) {
-    Property.ATOMIC.set(element, value);
-  }
-
-  @Override
-  public void setAriaBusyState(Element element, boolean value) {
-    State.BUSY.set(element, value);
-  }
-
-  @Override
-  public void setAriaControlsProperty(Element element, IdReference... value) {
-    Property.CONTROLS.set(element, value);
-  }
-
-  @Override
-  public void setAriaDescribedbyProperty(Element element, IdReference... value) {
-    Property.DESCRIBEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaDisabledState(Element element, boolean value) {
-    State.DISABLED.set(element, value);
-  }
-
-  @Override
-  public void setAriaDropeffectProperty(Element element, DropeffectValue... value) {
-    Property.DROPEFFECT.set(element, value);
-  }
-
-  @Override
-  public void setAriaFlowtoProperty(Element element, IdReference... value) {
-    Property.FLOWTO.set(element, value);
-  }
-
-  @Override
-  public void setAriaGrabbedState(Element element, GrabbedValue value) {
-    State.GRABBED.set(element, value);
-  }
-
-  @Override
-  public void setAriaHaspopupProperty(Element element, boolean value) {
-    Property.HASPOPUP.set(element, value);
-  }
-
-  @Override
-  public void setAriaHiddenState(Element element, boolean value) {
-    State.HIDDEN.set(element, value);
-  }
-
-  @Override
-  public void setAriaInvalidState(Element element, InvalidValue value) {
-    State.INVALID.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelledbyProperty(Element element, IdReference... value) {
-    Property.LABELLEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelProperty(Element element, String value) {
-    Property.LABEL.set(element, value);
-  }
-
-  @Override
-  public void setAriaLiveProperty(Element element, LiveValue value) {
-    Property.LIVE.set(element, value);
-  }
-
-  @Override
-  public void setAriaOwnsProperty(Element element, IdReference... value) {
-    Property.OWNS.set(element, value);
-  }
-
-  @Override
-  public void setAriaRelevantProperty(Element element, RelevantValue... value) {
-    Property.RELEVANT.set(element, value);
-  }
-
-  @Override
   public void setAriaValuemaxProperty(Element element, Number value) {
     Property.VALUEMAX.set(element, value);
   }
@@ -336,9 +86,4 @@
   public void setAriaValuetextProperty(Element element, String value) {
     Property.VALUETEXT.set(element, value);
   }
-
-  @Override
-  public void setTabindexExtraAttribute(Element element, int value) {
-    ExtraAttribute.TABINDEX.set(element, value);
-  }
 }
diff --git a/user/src/com/google/gwt/aria/client/RadioRole.java b/user/src/com/google/gwt/aria/client/RadioRole.java
index 7315a6c..3153ef5 100644
--- a/user/src/com/google/gwt/aria/client/RadioRole.java
+++ b/user/src/com/google/gwt/aria/client/RadioRole.java
@@ -17,7 +17,6 @@
 // This is auto-generated code.  Do not manually edit! //
 /////////////////////////////////////////////////////////
 
-
 /**
  * A type that represents the <a href="http://www.w3.org/TR/wai-aria/roles#radio">radio</a>
  * role in the ARIA specification.
diff --git a/user/src/com/google/gwt/aria/client/RadioRoleImpl.java b/user/src/com/google/gwt/aria/client/RadioRoleImpl.java
index 04f0146..103a02c 100644
--- a/user/src/com/google/gwt/aria/client/RadioRoleImpl.java
+++ b/user/src/com/google/gwt/aria/client/RadioRoleImpl.java
@@ -28,96 +28,16 @@
   }
 
   @Override
-  public String getAriaAtomicProperty(Element element) {
-    return Property.ATOMIC.get(element);
-  }
-
-  @Override
-  public String getAriaBusyState(Element element) {
-    return State.BUSY.get(element);
-  }
-
-  @Override
   public String getAriaCheckedState(Element element) {
     return State.CHECKED.get(element);
   }
 
   @Override
-  public String getAriaControlsProperty(Element element) {
-    return Property.CONTROLS.get(element);
-  }
-
-  @Override
-  public String getAriaDescribedbyProperty(Element element) {
-    return Property.DESCRIBEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaDisabledState(Element element) {
-    return State.DISABLED.get(element);
-  }
-
-  @Override
-  public String getAriaDropeffectProperty(Element element) {
-    return Property.DROPEFFECT.get(element);
-  }
-
-  @Override
-  public String getAriaFlowtoProperty(Element element) {
-    return Property.FLOWTO.get(element);
-  }
-
-  @Override
-  public String getAriaGrabbedState(Element element) {
-    return State.GRABBED.get(element);
-  }
-
-  @Override
-  public String getAriaHaspopupProperty(Element element) {
-    return Property.HASPOPUP.get(element);
-  }
-
-  @Override
-  public String getAriaHiddenState(Element element) {
-    return State.HIDDEN.get(element);
-  }
-
-  @Override
-  public String getAriaInvalidState(Element element) {
-    return State.INVALID.get(element);
-  }
-
-  @Override
-  public String getAriaLabelledbyProperty(Element element) {
-    return Property.LABELLEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaLabelProperty(Element element) {
-    return Property.LABEL.get(element);
-  }
-
-  @Override
-  public String getAriaLiveProperty(Element element) {
-    return Property.LIVE.get(element);
-  }
-
-  @Override
-  public String getAriaOwnsProperty(Element element) {
-    return Property.OWNS.get(element);
-  }
-
-  @Override
   public String getAriaPosinsetProperty(Element element) {
     return Property.POSINSET.get(element);
   }
 
   @Override
-  public String getAriaRelevantProperty(Element element) {
-    return Property.RELEVANT.get(element);
-  }
-
-  @Override
   public String getAriaSelectedState(Element element) {
     return State.SELECTED.get(element);
   }
@@ -128,101 +48,16 @@
   }
 
   @Override
-  public String getTabindexExtraAttribute(Element element) {
-    return ExtraAttribute.TABINDEX.get(element);
-  }
-
-  @Override
-  public void removeAriaAtomicProperty(Element element) {
-    Property.ATOMIC.remove(element);
-  }
-
-  @Override
-  public void removeAriaBusyState(Element element) {
-    State.BUSY.remove(element);
-  }
-
-  @Override
   public void removeAriaCheckedState(Element element) {
     State.CHECKED.remove(element);
   }
 
   @Override
-  public void removeAriaControlsProperty(Element element) {
-    Property.CONTROLS.remove(element);
-  }
-
-  @Override
-  public void removeAriaDescribedbyProperty(Element element) {
-    Property.DESCRIBEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaDisabledState(Element element) {
-    State.DISABLED.remove(element);
-  }
-
-  @Override
-  public void removeAriaDropeffectProperty(Element element) {
-    Property.DROPEFFECT.remove(element);
-  }
-
-  @Override
-  public void removeAriaFlowtoProperty(Element element) {
-    Property.FLOWTO.remove(element);
-  }
-
-  @Override
-  public void removeAriaGrabbedState(Element element) {
-    State.GRABBED.remove(element);
-  }
-
-  @Override
-  public void removeAriaHaspopupProperty(Element element) {
-    Property.HASPOPUP.remove(element);
-  }
-
-  @Override
-  public void removeAriaHiddenState(Element element) {
-    State.HIDDEN.remove(element);
-  }
-
-  @Override
-  public void removeAriaInvalidState(Element element) {
-    State.INVALID.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelledbyProperty(Element element) {
-    Property.LABELLEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelProperty(Element element) {
-    Property.LABEL.remove(element);
-  }
-
-  @Override
-  public void removeAriaLiveProperty(Element element) {
-    Property.LIVE.remove(element);
-  }
-
-  @Override
-  public void removeAriaOwnsProperty(Element element) {
-    Property.OWNS.remove(element);
-  }
-
-  @Override
   public void removeAriaPosinsetProperty(Element element) {
     Property.POSINSET.remove(element);
   }
 
   @Override
-  public void removeAriaRelevantProperty(Element element) {
-    Property.RELEVANT.remove(element);
-  }
-
-  @Override
   public void removeAriaSelectedState(Element element) {
     State.SELECTED.remove(element);
   }
@@ -233,101 +68,16 @@
   }
 
   @Override
-  public void removeTabindexExtraAttribute(Element element) {
-    ExtraAttribute.TABINDEX.remove(element);
-  }
-
-  @Override
-  public void setAriaAtomicProperty(Element element, boolean value) {
-    Property.ATOMIC.set(element, value);
-  }
-
-  @Override
-  public void setAriaBusyState(Element element, boolean value) {
-    State.BUSY.set(element, value);
-  }
-
-  @Override
   public void setAriaCheckedState(Element element, CheckedValue value) {
     State.CHECKED.set(element, value);
   }
 
   @Override
-  public void setAriaControlsProperty(Element element, IdReference... value) {
-    Property.CONTROLS.set(element, value);
-  }
-
-  @Override
-  public void setAriaDescribedbyProperty(Element element, IdReference... value) {
-    Property.DESCRIBEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaDisabledState(Element element, boolean value) {
-    State.DISABLED.set(element, value);
-  }
-
-  @Override
-  public void setAriaDropeffectProperty(Element element, DropeffectValue... value) {
-    Property.DROPEFFECT.set(element, value);
-  }
-
-  @Override
-  public void setAriaFlowtoProperty(Element element, IdReference... value) {
-    Property.FLOWTO.set(element, value);
-  }
-
-  @Override
-  public void setAriaGrabbedState(Element element, GrabbedValue value) {
-    State.GRABBED.set(element, value);
-  }
-
-  @Override
-  public void setAriaHaspopupProperty(Element element, boolean value) {
-    Property.HASPOPUP.set(element, value);
-  }
-
-  @Override
-  public void setAriaHiddenState(Element element, boolean value) {
-    State.HIDDEN.set(element, value);
-  }
-
-  @Override
-  public void setAriaInvalidState(Element element, InvalidValue value) {
-    State.INVALID.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelledbyProperty(Element element, IdReference... value) {
-    Property.LABELLEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelProperty(Element element, String value) {
-    Property.LABEL.set(element, value);
-  }
-
-  @Override
-  public void setAriaLiveProperty(Element element, LiveValue value) {
-    Property.LIVE.set(element, value);
-  }
-
-  @Override
-  public void setAriaOwnsProperty(Element element, IdReference... value) {
-    Property.OWNS.set(element, value);
-  }
-
-  @Override
   public void setAriaPosinsetProperty(Element element, int value) {
     Property.POSINSET.set(element, value);
   }
 
   @Override
-  public void setAriaRelevantProperty(Element element, RelevantValue... value) {
-    Property.RELEVANT.set(element, value);
-  }
-
-  @Override
   public void setAriaSelectedState(Element element, SelectedValue value) {
     State.SELECTED.set(element, value);
   }
@@ -336,9 +86,4 @@
   public void setAriaSetsizeProperty(Element element, int value) {
     Property.SETSIZE.set(element, value);
   }
-
-  @Override
-  public void setTabindexExtraAttribute(Element element, int value) {
-    ExtraAttribute.TABINDEX.set(element, value);
-  }
 }
diff --git a/user/src/com/google/gwt/aria/client/RadiogroupRoleImpl.java b/user/src/com/google/gwt/aria/client/RadiogroupRoleImpl.java
index a235445..163b617 100644
--- a/user/src/com/google/gwt/aria/client/RadiogroupRoleImpl.java
+++ b/user/src/com/google/gwt/aria/client/RadiogroupRoleImpl.java
@@ -33,297 +33,42 @@
   }
 
   @Override
-  public String getAriaAtomicProperty(Element element) {
-    return Property.ATOMIC.get(element);
-  }
-
-  @Override
-  public String getAriaBusyState(Element element) {
-    return State.BUSY.get(element);
-  }
-
-  @Override
-  public String getAriaControlsProperty(Element element) {
-    return Property.CONTROLS.get(element);
-  }
-
-  @Override
-  public String getAriaDescribedbyProperty(Element element) {
-    return Property.DESCRIBEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaDisabledState(Element element) {
-    return State.DISABLED.get(element);
-  }
-
-  @Override
-  public String getAriaDropeffectProperty(Element element) {
-    return Property.DROPEFFECT.get(element);
-  }
-
-  @Override
   public String getAriaExpandedState(Element element) {
     return State.EXPANDED.get(element);
   }
 
   @Override
-  public String getAriaFlowtoProperty(Element element) {
-    return Property.FLOWTO.get(element);
-  }
-
-  @Override
-  public String getAriaGrabbedState(Element element) {
-    return State.GRABBED.get(element);
-  }
-
-  @Override
-  public String getAriaHaspopupProperty(Element element) {
-    return Property.HASPOPUP.get(element);
-  }
-
-  @Override
-  public String getAriaHiddenState(Element element) {
-    return State.HIDDEN.get(element);
-  }
-
-  @Override
-  public String getAriaInvalidState(Element element) {
-    return State.INVALID.get(element);
-  }
-
-  @Override
-  public String getAriaLabelledbyProperty(Element element) {
-    return Property.LABELLEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaLabelProperty(Element element) {
-    return Property.LABEL.get(element);
-  }
-
-  @Override
-  public String getAriaLiveProperty(Element element) {
-    return Property.LIVE.get(element);
-  }
-
-  @Override
-  public String getAriaOwnsProperty(Element element) {
-    return Property.OWNS.get(element);
-  }
-
-  @Override
-  public String getAriaRelevantProperty(Element element) {
-    return Property.RELEVANT.get(element);
-  }
-
-  @Override
   public String getAriaRequiredProperty(Element element) {
     return Property.REQUIRED.get(element);
   }
 
   @Override
-  public String getTabindexExtraAttribute(Element element) {
-    return ExtraAttribute.TABINDEX.get(element);
-  }
-
-  @Override
   public void removeAriaActivedescendantProperty(Element element) {
     Property.ACTIVEDESCENDANT.remove(element);
   }
 
   @Override
-  public void removeAriaAtomicProperty(Element element) {
-    Property.ATOMIC.remove(element);
-  }
-
-  @Override
-  public void removeAriaBusyState(Element element) {
-    State.BUSY.remove(element);
-  }
-
-  @Override
-  public void removeAriaControlsProperty(Element element) {
-    Property.CONTROLS.remove(element);
-  }
-
-  @Override
-  public void removeAriaDescribedbyProperty(Element element) {
-    Property.DESCRIBEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaDisabledState(Element element) {
-    State.DISABLED.remove(element);
-  }
-
-  @Override
-  public void removeAriaDropeffectProperty(Element element) {
-    Property.DROPEFFECT.remove(element);
-  }
-
-  @Override
   public void removeAriaExpandedState(Element element) {
     State.EXPANDED.remove(element);
   }
 
   @Override
-  public void removeAriaFlowtoProperty(Element element) {
-    Property.FLOWTO.remove(element);
-  }
-
-  @Override
-  public void removeAriaGrabbedState(Element element) {
-    State.GRABBED.remove(element);
-  }
-
-  @Override
-  public void removeAriaHaspopupProperty(Element element) {
-    Property.HASPOPUP.remove(element);
-  }
-
-  @Override
-  public void removeAriaHiddenState(Element element) {
-    State.HIDDEN.remove(element);
-  }
-
-  @Override
-  public void removeAriaInvalidState(Element element) {
-    State.INVALID.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelledbyProperty(Element element) {
-    Property.LABELLEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelProperty(Element element) {
-    Property.LABEL.remove(element);
-  }
-
-  @Override
-  public void removeAriaLiveProperty(Element element) {
-    Property.LIVE.remove(element);
-  }
-
-  @Override
-  public void removeAriaOwnsProperty(Element element) {
-    Property.OWNS.remove(element);
-  }
-
-  @Override
-  public void removeAriaRelevantProperty(Element element) {
-    Property.RELEVANT.remove(element);
-  }
-
-  @Override
   public void removeAriaRequiredProperty(Element element) {
     Property.REQUIRED.remove(element);
   }
 
   @Override
-  public void removeTabindexExtraAttribute(Element element) {
-    ExtraAttribute.TABINDEX.remove(element);
-  }
-
-  @Override
   public void setAriaActivedescendantProperty(Element element, IdReference value) {
     Property.ACTIVEDESCENDANT.set(element, value);
   }
 
   @Override
-  public void setAriaAtomicProperty(Element element, boolean value) {
-    Property.ATOMIC.set(element, value);
-  }
-
-  @Override
-  public void setAriaBusyState(Element element, boolean value) {
-    State.BUSY.set(element, value);
-  }
-
-  @Override
-  public void setAriaControlsProperty(Element element, IdReference... value) {
-    Property.CONTROLS.set(element, value);
-  }
-
-  @Override
-  public void setAriaDescribedbyProperty(Element element, IdReference... value) {
-    Property.DESCRIBEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaDisabledState(Element element, boolean value) {
-    State.DISABLED.set(element, value);
-  }
-
-  @Override
-  public void setAriaDropeffectProperty(Element element, DropeffectValue... value) {
-    Property.DROPEFFECT.set(element, value);
-  }
-
-  @Override
   public void setAriaExpandedState(Element element, ExpandedValue value) {
     State.EXPANDED.set(element, value);
   }
 
   @Override
-  public void setAriaFlowtoProperty(Element element, IdReference... value) {
-    Property.FLOWTO.set(element, value);
-  }
-
-  @Override
-  public void setAriaGrabbedState(Element element, GrabbedValue value) {
-    State.GRABBED.set(element, value);
-  }
-
-  @Override
-  public void setAriaHaspopupProperty(Element element, boolean value) {
-    Property.HASPOPUP.set(element, value);
-  }
-
-  @Override
-  public void setAriaHiddenState(Element element, boolean value) {
-    State.HIDDEN.set(element, value);
-  }
-
-  @Override
-  public void setAriaInvalidState(Element element, InvalidValue value) {
-    State.INVALID.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelledbyProperty(Element element, IdReference... value) {
-    Property.LABELLEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelProperty(Element element, String value) {
-    Property.LABEL.set(element, value);
-  }
-
-  @Override
-  public void setAriaLiveProperty(Element element, LiveValue value) {
-    Property.LIVE.set(element, value);
-  }
-
-  @Override
-  public void setAriaOwnsProperty(Element element, IdReference... value) {
-    Property.OWNS.set(element, value);
-  }
-
-  @Override
-  public void setAriaRelevantProperty(Element element, RelevantValue... value) {
-    Property.RELEVANT.set(element, value);
-  }
-
-  @Override
   public void setAriaRequiredProperty(Element element, boolean value) {
     Property.REQUIRED.set(element, value);
   }
-
-  @Override
-  public void setTabindexExtraAttribute(Element element, int value) {
-    ExtraAttribute.TABINDEX.set(element, value);
-  }
 }
diff --git a/user/src/com/google/gwt/aria/client/RegionRole.java b/user/src/com/google/gwt/aria/client/RegionRole.java
index dec20f8..5d522a9 100644
--- a/user/src/com/google/gwt/aria/client/RegionRole.java
+++ b/user/src/com/google/gwt/aria/client/RegionRole.java
@@ -17,7 +17,6 @@
 // This is auto-generated code.  Do not manually edit! //
 /////////////////////////////////////////////////////////
 
-
 /**
  * A type that represents the <a href="http://www.w3.org/TR/wai-aria/roles#region">region</a>
  * role in the ARIA specification.
diff --git a/user/src/com/google/gwt/aria/client/RegionRoleImpl.java b/user/src/com/google/gwt/aria/client/RegionRoleImpl.java
index 12816ab..a2657b2 100644
--- a/user/src/com/google/gwt/aria/client/RegionRoleImpl.java
+++ b/user/src/com/google/gwt/aria/client/RegionRoleImpl.java
@@ -28,272 +28,17 @@
   }
 
   @Override
-  public String getAriaAtomicProperty(Element element) {
-    return Property.ATOMIC.get(element);
-  }
-
-  @Override
-  public String getAriaBusyState(Element element) {
-    return State.BUSY.get(element);
-  }
-
-  @Override
-  public String getAriaControlsProperty(Element element) {
-    return Property.CONTROLS.get(element);
-  }
-
-  @Override
-  public String getAriaDescribedbyProperty(Element element) {
-    return Property.DESCRIBEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaDisabledState(Element element) {
-    return State.DISABLED.get(element);
-  }
-
-  @Override
-  public String getAriaDropeffectProperty(Element element) {
-    return Property.DROPEFFECT.get(element);
-  }
-
-  @Override
   public String getAriaExpandedState(Element element) {
     return State.EXPANDED.get(element);
   }
 
   @Override
-  public String getAriaFlowtoProperty(Element element) {
-    return Property.FLOWTO.get(element);
-  }
-
-  @Override
-  public String getAriaGrabbedState(Element element) {
-    return State.GRABBED.get(element);
-  }
-
-  @Override
-  public String getAriaHaspopupProperty(Element element) {
-    return Property.HASPOPUP.get(element);
-  }
-
-  @Override
-  public String getAriaHiddenState(Element element) {
-    return State.HIDDEN.get(element);
-  }
-
-  @Override
-  public String getAriaInvalidState(Element element) {
-    return State.INVALID.get(element);
-  }
-
-  @Override
-  public String getAriaLabelledbyProperty(Element element) {
-    return Property.LABELLEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaLabelProperty(Element element) {
-    return Property.LABEL.get(element);
-  }
-
-  @Override
-  public String getAriaLiveProperty(Element element) {
-    return Property.LIVE.get(element);
-  }
-
-  @Override
-  public String getAriaOwnsProperty(Element element) {
-    return Property.OWNS.get(element);
-  }
-
-  @Override
-  public String getAriaRelevantProperty(Element element) {
-    return Property.RELEVANT.get(element);
-  }
-
-  @Override
-  public String getTabindexExtraAttribute(Element element) {
-    return ExtraAttribute.TABINDEX.get(element);
-  }
-
-  @Override
-  public void removeAriaAtomicProperty(Element element) {
-    Property.ATOMIC.remove(element);
-  }
-
-  @Override
-  public void removeAriaBusyState(Element element) {
-    State.BUSY.remove(element);
-  }
-
-  @Override
-  public void removeAriaControlsProperty(Element element) {
-    Property.CONTROLS.remove(element);
-  }
-
-  @Override
-  public void removeAriaDescribedbyProperty(Element element) {
-    Property.DESCRIBEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaDisabledState(Element element) {
-    State.DISABLED.remove(element);
-  }
-
-  @Override
-  public void removeAriaDropeffectProperty(Element element) {
-    Property.DROPEFFECT.remove(element);
-  }
-
-  @Override
   public void removeAriaExpandedState(Element element) {
     State.EXPANDED.remove(element);
   }
 
   @Override
-  public void removeAriaFlowtoProperty(Element element) {
-    Property.FLOWTO.remove(element);
-  }
-
-  @Override
-  public void removeAriaGrabbedState(Element element) {
-    State.GRABBED.remove(element);
-  }
-
-  @Override
-  public void removeAriaHaspopupProperty(Element element) {
-    Property.HASPOPUP.remove(element);
-  }
-
-  @Override
-  public void removeAriaHiddenState(Element element) {
-    State.HIDDEN.remove(element);
-  }
-
-  @Override
-  public void removeAriaInvalidState(Element element) {
-    State.INVALID.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelledbyProperty(Element element) {
-    Property.LABELLEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelProperty(Element element) {
-    Property.LABEL.remove(element);
-  }
-
-  @Override
-  public void removeAriaLiveProperty(Element element) {
-    Property.LIVE.remove(element);
-  }
-
-  @Override
-  public void removeAriaOwnsProperty(Element element) {
-    Property.OWNS.remove(element);
-  }
-
-  @Override
-  public void removeAriaRelevantProperty(Element element) {
-    Property.RELEVANT.remove(element);
-  }
-
-  @Override
-  public void removeTabindexExtraAttribute(Element element) {
-    ExtraAttribute.TABINDEX.remove(element);
-  }
-
-  @Override
-  public void setAriaAtomicProperty(Element element, boolean value) {
-    Property.ATOMIC.set(element, value);
-  }
-
-  @Override
-  public void setAriaBusyState(Element element, boolean value) {
-    State.BUSY.set(element, value);
-  }
-
-  @Override
-  public void setAriaControlsProperty(Element element, IdReference... value) {
-    Property.CONTROLS.set(element, value);
-  }
-
-  @Override
-  public void setAriaDescribedbyProperty(Element element, IdReference... value) {
-    Property.DESCRIBEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaDisabledState(Element element, boolean value) {
-    State.DISABLED.set(element, value);
-  }
-
-  @Override
-  public void setAriaDropeffectProperty(Element element, DropeffectValue... value) {
-    Property.DROPEFFECT.set(element, value);
-  }
-
-  @Override
   public void setAriaExpandedState(Element element, ExpandedValue value) {
     State.EXPANDED.set(element, value);
   }
-
-  @Override
-  public void setAriaFlowtoProperty(Element element, IdReference... value) {
-    Property.FLOWTO.set(element, value);
-  }
-
-  @Override
-  public void setAriaGrabbedState(Element element, GrabbedValue value) {
-    State.GRABBED.set(element, value);
-  }
-
-  @Override
-  public void setAriaHaspopupProperty(Element element, boolean value) {
-    Property.HASPOPUP.set(element, value);
-  }
-
-  @Override
-  public void setAriaHiddenState(Element element, boolean value) {
-    State.HIDDEN.set(element, value);
-  }
-
-  @Override
-  public void setAriaInvalidState(Element element, InvalidValue value) {
-    State.INVALID.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelledbyProperty(Element element, IdReference... value) {
-    Property.LABELLEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelProperty(Element element, String value) {
-    Property.LABEL.set(element, value);
-  }
-
-  @Override
-  public void setAriaLiveProperty(Element element, LiveValue value) {
-    Property.LIVE.set(element, value);
-  }
-
-  @Override
-  public void setAriaOwnsProperty(Element element, IdReference... value) {
-    Property.OWNS.set(element, value);
-  }
-
-  @Override
-  public void setAriaRelevantProperty(Element element, RelevantValue... value) {
-    Property.RELEVANT.set(element, value);
-  }
-
-  @Override
-  public void setTabindexExtraAttribute(Element element, int value) {
-    ExtraAttribute.TABINDEX.set(element, value);
-  }
 }
diff --git a/user/src/com/google/gwt/aria/client/RoleImpl.java b/user/src/com/google/gwt/aria/client/RoleImpl.java
index df8c999..669f633 100644
--- a/user/src/com/google/gwt/aria/client/RoleImpl.java
+++ b/user/src/com/google/gwt/aria/client/RoleImpl.java
@@ -20,21 +20,10 @@
 import com.google.gwt.dom.client.Element;
 
 /**
- * <p>Allows ARIA Accessibility attributes to be added to widgets so that they can be identified by
- * assistive technology.</p>
- *
- * <p>ARIA roles define widgets and page structure that can be interpreted by a reader
- * application/device. There is a set of abstract roles which are used as
- * building blocks of the roles hierarchy structural and define the common properties and states
- * for the concrete roles. Abstract roles cannot be set to HTML elements.</p>
- *
- * <p>This class defines some of the supported operations for a role -- set/get/remove
- * role to/from a DOM element.</p>
- *
- * <p>For more details about ARIA roles check <a href="http://www.w3.org/TR/wai-aria/roles">
- * The Roles Model </a>.</p>
+ * The base class for implementing a Role. Includes basic operations for modifying
+ * the "role" attribute and methods that are common to all roles.
  */
-class RoleImpl {
+class RoleImpl implements Role {
   private static final String ATTR_NAME_ROLE = "role";
 
   private final String roleName;
@@ -50,37 +39,296 @@
    * @param element HTML element
    * @return The role attribute value
    */
+  @Override
   public String get(Element element) {
     assert element != null : "Element cannot be null.";
     return element.getAttribute(ATTR_NAME_ROLE);
   }
 
+  @Override
+  public String getAriaAtomicProperty(Element element) {
+    return Property.ATOMIC.get(element);
+  }
+
+  @Override
+  public String getAriaBusyState(Element element) {
+    return State.BUSY.get(element);
+  }
+
+  @Override
+  public String getAriaControlsProperty(Element element) {
+    return Property.CONTROLS.get(element);
+  }
+
+  @Override
+  public String getAriaDescribedbyProperty(Element element) {
+    return Property.DESCRIBEDBY.get(element);
+  }
+
+  @Override
+  public String getAriaDisabledState(Element element) {
+    return State.DISABLED.get(element);
+  }
+
+  @Override
+  public String getAriaDropeffectProperty(Element element) {
+    return Property.DROPEFFECT.get(element);
+  }
+
+  @Override
+  public String getAriaFlowtoProperty(Element element) {
+    return Property.FLOWTO.get(element);
+  }
+
+  @Override
+  public String getAriaGrabbedState(Element element) {
+    return State.GRABBED.get(element);
+  }
+
+  @Override
+  public String getAriaHaspopupProperty(Element element) {
+    return Property.HASPOPUP.get(element);
+  }
+
+  @Override
+  public String getAriaHiddenState(Element element) {
+    return State.HIDDEN.get(element);
+  }
+
+  @Override
+  public String getAriaInvalidState(Element element) {
+    return State.INVALID.get(element);
+  }
+
+  @Override
+  public String getAriaLabelledbyProperty(Element element) {
+    return Property.LABELLEDBY.get(element);
+  }
+
+  @Override
+  public String getAriaLabelProperty(Element element) {
+    return Property.LABEL.get(element);
+  }
+
+  @Override
+  public String getAriaLiveProperty(Element element) {
+    return Property.LIVE.get(element);
+  }
+
+  @Override
+  public String getAriaOwnsProperty(Element element) {
+    return Property.OWNS.get(element);
+  }
+
+  @Override
+  public String getAriaRelevantProperty(Element element) {
+    return Property.RELEVANT.get(element);
+  }
+
   /**
    * Gets the role name
    *
    * @return The role name
    */
+  @Override
   public String getName() {
     return roleName;
   }
 
+  @Override
+  public String getTabindexExtraAttribute(Element element) {
+    return ExtraAttribute.TABINDEX.get(element);
+  }
+
   /**
    * Removes the role for element {@code element}
    *
    * @param element HTML element
    */
+  @Override
   public void remove(Element element) {
     assert element != null : "Element cannot be null.";
     element.removeAttribute(ATTR_NAME_ROLE);
   }
 
+  @Override
+  public void removeAriaAtomicProperty(Element element) {
+    Property.ATOMIC.remove(element);
+  }
+
+  @Override
+  public void removeAriaBusyState(Element element) {
+    State.BUSY.remove(element);
+  }
+
+  @Override
+  public void removeAriaControlsProperty(Element element) {
+    Property.CONTROLS.remove(element);
+  }
+
+  @Override
+  public void removeAriaDescribedbyProperty(Element element) {
+    Property.DESCRIBEDBY.remove(element);
+  }
+
+  @Override
+  public void removeAriaDisabledState(Element element) {
+    State.DISABLED.remove(element);
+  }
+
+  @Override
+  public void removeAriaDropeffectProperty(Element element) {
+    Property.DROPEFFECT.remove(element);
+  }
+
+  @Override
+  public void removeAriaFlowtoProperty(Element element) {
+    Property.FLOWTO.remove(element);
+  }
+
+  @Override
+  public void removeAriaGrabbedState(Element element) {
+    State.GRABBED.remove(element);
+  }
+
+  @Override
+  public void removeAriaHaspopupProperty(Element element) {
+    Property.HASPOPUP.remove(element);
+  }
+
+  @Override
+  public void removeAriaHiddenState(Element element) {
+    State.HIDDEN.remove(element);
+  }
+
+  @Override
+  public void removeAriaInvalidState(Element element) {
+    State.INVALID.remove(element);
+  }
+
+  @Override
+  public void removeAriaLabelledbyProperty(Element element) {
+    Property.LABELLEDBY.remove(element);
+  }
+
+  @Override
+  public void removeAriaLabelProperty(Element element) {
+    Property.LABEL.remove(element);
+  }
+
+  @Override
+  public void removeAriaLiveProperty(Element element) {
+    Property.LIVE.remove(element);
+  }
+
+  @Override
+  public void removeAriaOwnsProperty(Element element) {
+    Property.OWNS.remove(element);
+  }
+
+  @Override
+  public void removeAriaRelevantProperty(Element element) {
+    Property.RELEVANT.remove(element);
+  }
+
+  @Override
+  public void removeTabindexExtraAttribute(Element element) {
+    ExtraAttribute.TABINDEX.remove(element);
+  }
+
   /**
    * Sets the role to element {@code element}
    *
    * @param element HTML element
    */
+  @Override
   public void set(Element element) {
     assert element != null : "Element cannot be null.";
     element.setAttribute(ATTR_NAME_ROLE, roleName);
   }
+
+  @Override
+  public void setAriaAtomicProperty(Element element, boolean value) {
+    Property.ATOMIC.set(element, value);
+  }
+
+  @Override
+  public void setAriaBusyState(Element element, boolean value) {
+    State.BUSY.set(element, value);
+  }
+
+  @Override
+  public void setAriaControlsProperty(Element element, IdReference... value) {
+    Property.CONTROLS.set(element, value);
+  }
+
+  @Override
+  public void setAriaDescribedbyProperty(Element element, IdReference... value) {
+    Property.DESCRIBEDBY.set(element, value);
+  }
+
+  @Override
+  public void setAriaDisabledState(Element element, boolean value) {
+    State.DISABLED.set(element, value);
+  }
+
+  @Override
+  public void setAriaDropeffectProperty(Element element, DropeffectValue... value) {
+    Property.DROPEFFECT.set(element, value);
+  }
+
+  @Override
+  public void setAriaFlowtoProperty(Element element, IdReference... value) {
+    Property.FLOWTO.set(element, value);
+  }
+
+  @Override
+  public void setAriaGrabbedState(Element element, GrabbedValue value) {
+    State.GRABBED.set(element, value);
+  }
+
+  @Override
+  public void setAriaHaspopupProperty(Element element, boolean value) {
+    Property.HASPOPUP.set(element, value);
+  }
+
+  @Override
+  public void setAriaHiddenState(Element element, boolean value) {
+    State.HIDDEN.set(element, value);
+  }
+
+  @Override
+  public void setAriaInvalidState(Element element, InvalidValue value) {
+    State.INVALID.set(element, value);
+  }
+
+  @Override
+  public void setAriaLabelledbyProperty(Element element, IdReference... value) {
+    Property.LABELLEDBY.set(element, value);
+  }
+
+  @Override
+  public void setAriaLabelProperty(Element element, String value) {
+    Property.LABEL.set(element, value);
+  }
+
+  @Override
+  public void setAriaLiveProperty(Element element, LiveValue value) {
+    Property.LIVE.set(element, value);
+  }
+
+  @Override
+  public void setAriaOwnsProperty(Element element, IdReference... value) {
+    Property.OWNS.set(element, value);
+  }
+
+  @Override
+  public void setAriaRelevantProperty(Element element, RelevantValue... value) {
+    Property.RELEVANT.set(element, value);
+  }
+
+  @Override
+  public void setTabindexExtraAttribute(Element element, int value) {
+    ExtraAttribute.TABINDEX.set(element, value);
+  }
 }
diff --git a/user/src/com/google/gwt/aria/client/RowRoleImpl.java b/user/src/com/google/gwt/aria/client/RowRoleImpl.java
index 9b9a467..7d56da5 100644
--- a/user/src/com/google/gwt/aria/client/RowRoleImpl.java
+++ b/user/src/com/google/gwt/aria/client/RowRoleImpl.java
@@ -33,312 +33,57 @@
   }
 
   @Override
-  public String getAriaAtomicProperty(Element element) {
-    return Property.ATOMIC.get(element);
-  }
-
-  @Override
-  public String getAriaBusyState(Element element) {
-    return State.BUSY.get(element);
-  }
-
-  @Override
-  public String getAriaControlsProperty(Element element) {
-    return Property.CONTROLS.get(element);
-  }
-
-  @Override
-  public String getAriaDescribedbyProperty(Element element) {
-    return Property.DESCRIBEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaDisabledState(Element element) {
-    return State.DISABLED.get(element);
-  }
-
-  @Override
-  public String getAriaDropeffectProperty(Element element) {
-    return Property.DROPEFFECT.get(element);
-  }
-
-  @Override
   public String getAriaExpandedState(Element element) {
     return State.EXPANDED.get(element);
   }
 
   @Override
-  public String getAriaFlowtoProperty(Element element) {
-    return Property.FLOWTO.get(element);
-  }
-
-  @Override
-  public String getAriaGrabbedState(Element element) {
-    return State.GRABBED.get(element);
-  }
-
-  @Override
-  public String getAriaHaspopupProperty(Element element) {
-    return Property.HASPOPUP.get(element);
-  }
-
-  @Override
-  public String getAriaHiddenState(Element element) {
-    return State.HIDDEN.get(element);
-  }
-
-  @Override
-  public String getAriaInvalidState(Element element) {
-    return State.INVALID.get(element);
-  }
-
-  @Override
-  public String getAriaLabelledbyProperty(Element element) {
-    return Property.LABELLEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaLabelProperty(Element element) {
-    return Property.LABEL.get(element);
-  }
-
-  @Override
   public String getAriaLevelProperty(Element element) {
     return Property.LEVEL.get(element);
   }
 
   @Override
-  public String getAriaLiveProperty(Element element) {
-    return Property.LIVE.get(element);
-  }
-
-  @Override
-  public String getAriaOwnsProperty(Element element) {
-    return Property.OWNS.get(element);
-  }
-
-  @Override
-  public String getAriaRelevantProperty(Element element) {
-    return Property.RELEVANT.get(element);
-  }
-
-  @Override
   public String getAriaSelectedState(Element element) {
     return State.SELECTED.get(element);
   }
 
   @Override
-  public String getTabindexExtraAttribute(Element element) {
-    return ExtraAttribute.TABINDEX.get(element);
-  }
-
-  @Override
   public void removeAriaActivedescendantProperty(Element element) {
     Property.ACTIVEDESCENDANT.remove(element);
   }
 
   @Override
-  public void removeAriaAtomicProperty(Element element) {
-    Property.ATOMIC.remove(element);
-  }
-
-  @Override
-  public void removeAriaBusyState(Element element) {
-    State.BUSY.remove(element);
-  }
-
-  @Override
-  public void removeAriaControlsProperty(Element element) {
-    Property.CONTROLS.remove(element);
-  }
-
-  @Override
-  public void removeAriaDescribedbyProperty(Element element) {
-    Property.DESCRIBEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaDisabledState(Element element) {
-    State.DISABLED.remove(element);
-  }
-
-  @Override
-  public void removeAriaDropeffectProperty(Element element) {
-    Property.DROPEFFECT.remove(element);
-  }
-
-  @Override
   public void removeAriaExpandedState(Element element) {
     State.EXPANDED.remove(element);
   }
 
   @Override
-  public void removeAriaFlowtoProperty(Element element) {
-    Property.FLOWTO.remove(element);
-  }
-
-  @Override
-  public void removeAriaGrabbedState(Element element) {
-    State.GRABBED.remove(element);
-  }
-
-  @Override
-  public void removeAriaHaspopupProperty(Element element) {
-    Property.HASPOPUP.remove(element);
-  }
-
-  @Override
-  public void removeAriaHiddenState(Element element) {
-    State.HIDDEN.remove(element);
-  }
-
-  @Override
-  public void removeAriaInvalidState(Element element) {
-    State.INVALID.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelledbyProperty(Element element) {
-    Property.LABELLEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelProperty(Element element) {
-    Property.LABEL.remove(element);
-  }
-
-  @Override
   public void removeAriaLevelProperty(Element element) {
     Property.LEVEL.remove(element);
   }
 
   @Override
-  public void removeAriaLiveProperty(Element element) {
-    Property.LIVE.remove(element);
-  }
-
-  @Override
-  public void removeAriaOwnsProperty(Element element) {
-    Property.OWNS.remove(element);
-  }
-
-  @Override
-  public void removeAriaRelevantProperty(Element element) {
-    Property.RELEVANT.remove(element);
-  }
-
-  @Override
   public void removeAriaSelectedState(Element element) {
     State.SELECTED.remove(element);
   }
 
   @Override
-  public void removeTabindexExtraAttribute(Element element) {
-    ExtraAttribute.TABINDEX.remove(element);
-  }
-
-  @Override
   public void setAriaActivedescendantProperty(Element element, IdReference value) {
     Property.ACTIVEDESCENDANT.set(element, value);
   }
 
   @Override
-  public void setAriaAtomicProperty(Element element, boolean value) {
-    Property.ATOMIC.set(element, value);
-  }
-
-  @Override
-  public void setAriaBusyState(Element element, boolean value) {
-    State.BUSY.set(element, value);
-  }
-
-  @Override
-  public void setAriaControlsProperty(Element element, IdReference... value) {
-    Property.CONTROLS.set(element, value);
-  }
-
-  @Override
-  public void setAriaDescribedbyProperty(Element element, IdReference... value) {
-    Property.DESCRIBEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaDisabledState(Element element, boolean value) {
-    State.DISABLED.set(element, value);
-  }
-
-  @Override
-  public void setAriaDropeffectProperty(Element element, DropeffectValue... value) {
-    Property.DROPEFFECT.set(element, value);
-  }
-
-  @Override
   public void setAriaExpandedState(Element element, ExpandedValue value) {
     State.EXPANDED.set(element, value);
   }
 
   @Override
-  public void setAriaFlowtoProperty(Element element, IdReference... value) {
-    Property.FLOWTO.set(element, value);
-  }
-
-  @Override
-  public void setAriaGrabbedState(Element element, GrabbedValue value) {
-    State.GRABBED.set(element, value);
-  }
-
-  @Override
-  public void setAriaHaspopupProperty(Element element, boolean value) {
-    Property.HASPOPUP.set(element, value);
-  }
-
-  @Override
-  public void setAriaHiddenState(Element element, boolean value) {
-    State.HIDDEN.set(element, value);
-  }
-
-  @Override
-  public void setAriaInvalidState(Element element, InvalidValue value) {
-    State.INVALID.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelledbyProperty(Element element, IdReference... value) {
-    Property.LABELLEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelProperty(Element element, String value) {
-    Property.LABEL.set(element, value);
-  }
-
-  @Override
   public void setAriaLevelProperty(Element element, int value) {
     Property.LEVEL.set(element, value);
   }
 
   @Override
-  public void setAriaLiveProperty(Element element, LiveValue value) {
-    Property.LIVE.set(element, value);
-  }
-
-  @Override
-  public void setAriaOwnsProperty(Element element, IdReference... value) {
-    Property.OWNS.set(element, value);
-  }
-
-  @Override
-  public void setAriaRelevantProperty(Element element, RelevantValue... value) {
-    Property.RELEVANT.set(element, value);
-  }
-
-  @Override
   public void setAriaSelectedState(Element element, SelectedValue value) {
     State.SELECTED.set(element, value);
   }
-
-  @Override
-  public void setTabindexExtraAttribute(Element element, int value) {
-    ExtraAttribute.TABINDEX.set(element, value);
-  }
 }
diff --git a/user/src/com/google/gwt/aria/client/RowgroupRole.java b/user/src/com/google/gwt/aria/client/RowgroupRole.java
index 55ba25e..8921248 100644
--- a/user/src/com/google/gwt/aria/client/RowgroupRole.java
+++ b/user/src/com/google/gwt/aria/client/RowgroupRole.java
@@ -17,7 +17,6 @@
 // This is auto-generated code.  Do not manually edit! //
 /////////////////////////////////////////////////////////
 
-
 /**
  * A type that represents the <a href="http://www.w3.org/TR/wai-aria/roles#rowgroup">rowgroup</a>
  * role in the ARIA specification.
diff --git a/user/src/com/google/gwt/aria/client/RowgroupRoleImpl.java b/user/src/com/google/gwt/aria/client/RowgroupRoleImpl.java
index 74ec684..0b191b5 100644
--- a/user/src/com/google/gwt/aria/client/RowgroupRoleImpl.java
+++ b/user/src/com/google/gwt/aria/client/RowgroupRoleImpl.java
@@ -33,282 +33,27 @@
   }
 
   @Override
-  public String getAriaAtomicProperty(Element element) {
-    return Property.ATOMIC.get(element);
-  }
-
-  @Override
-  public String getAriaBusyState(Element element) {
-    return State.BUSY.get(element);
-  }
-
-  @Override
-  public String getAriaControlsProperty(Element element) {
-    return Property.CONTROLS.get(element);
-  }
-
-  @Override
-  public String getAriaDescribedbyProperty(Element element) {
-    return Property.DESCRIBEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaDisabledState(Element element) {
-    return State.DISABLED.get(element);
-  }
-
-  @Override
-  public String getAriaDropeffectProperty(Element element) {
-    return Property.DROPEFFECT.get(element);
-  }
-
-  @Override
   public String getAriaExpandedState(Element element) {
     return State.EXPANDED.get(element);
   }
 
   @Override
-  public String getAriaFlowtoProperty(Element element) {
-    return Property.FLOWTO.get(element);
-  }
-
-  @Override
-  public String getAriaGrabbedState(Element element) {
-    return State.GRABBED.get(element);
-  }
-
-  @Override
-  public String getAriaHaspopupProperty(Element element) {
-    return Property.HASPOPUP.get(element);
-  }
-
-  @Override
-  public String getAriaHiddenState(Element element) {
-    return State.HIDDEN.get(element);
-  }
-
-  @Override
-  public String getAriaInvalidState(Element element) {
-    return State.INVALID.get(element);
-  }
-
-  @Override
-  public String getAriaLabelledbyProperty(Element element) {
-    return Property.LABELLEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaLabelProperty(Element element) {
-    return Property.LABEL.get(element);
-  }
-
-  @Override
-  public String getAriaLiveProperty(Element element) {
-    return Property.LIVE.get(element);
-  }
-
-  @Override
-  public String getAriaOwnsProperty(Element element) {
-    return Property.OWNS.get(element);
-  }
-
-  @Override
-  public String getAriaRelevantProperty(Element element) {
-    return Property.RELEVANT.get(element);
-  }
-
-  @Override
-  public String getTabindexExtraAttribute(Element element) {
-    return ExtraAttribute.TABINDEX.get(element);
-  }
-
-  @Override
   public void removeAriaActivedescendantProperty(Element element) {
     Property.ACTIVEDESCENDANT.remove(element);
   }
 
   @Override
-  public void removeAriaAtomicProperty(Element element) {
-    Property.ATOMIC.remove(element);
-  }
-
-  @Override
-  public void removeAriaBusyState(Element element) {
-    State.BUSY.remove(element);
-  }
-
-  @Override
-  public void removeAriaControlsProperty(Element element) {
-    Property.CONTROLS.remove(element);
-  }
-
-  @Override
-  public void removeAriaDescribedbyProperty(Element element) {
-    Property.DESCRIBEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaDisabledState(Element element) {
-    State.DISABLED.remove(element);
-  }
-
-  @Override
-  public void removeAriaDropeffectProperty(Element element) {
-    Property.DROPEFFECT.remove(element);
-  }
-
-  @Override
   public void removeAriaExpandedState(Element element) {
     State.EXPANDED.remove(element);
   }
 
   @Override
-  public void removeAriaFlowtoProperty(Element element) {
-    Property.FLOWTO.remove(element);
-  }
-
-  @Override
-  public void removeAriaGrabbedState(Element element) {
-    State.GRABBED.remove(element);
-  }
-
-  @Override
-  public void removeAriaHaspopupProperty(Element element) {
-    Property.HASPOPUP.remove(element);
-  }
-
-  @Override
-  public void removeAriaHiddenState(Element element) {
-    State.HIDDEN.remove(element);
-  }
-
-  @Override
-  public void removeAriaInvalidState(Element element) {
-    State.INVALID.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelledbyProperty(Element element) {
-    Property.LABELLEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelProperty(Element element) {
-    Property.LABEL.remove(element);
-  }
-
-  @Override
-  public void removeAriaLiveProperty(Element element) {
-    Property.LIVE.remove(element);
-  }
-
-  @Override
-  public void removeAriaOwnsProperty(Element element) {
-    Property.OWNS.remove(element);
-  }
-
-  @Override
-  public void removeAriaRelevantProperty(Element element) {
-    Property.RELEVANT.remove(element);
-  }
-
-  @Override
-  public void removeTabindexExtraAttribute(Element element) {
-    ExtraAttribute.TABINDEX.remove(element);
-  }
-
-  @Override
   public void setAriaActivedescendantProperty(Element element, IdReference value) {
     Property.ACTIVEDESCENDANT.set(element, value);
   }
 
   @Override
-  public void setAriaAtomicProperty(Element element, boolean value) {
-    Property.ATOMIC.set(element, value);
-  }
-
-  @Override
-  public void setAriaBusyState(Element element, boolean value) {
-    State.BUSY.set(element, value);
-  }
-
-  @Override
-  public void setAriaControlsProperty(Element element, IdReference... value) {
-    Property.CONTROLS.set(element, value);
-  }
-
-  @Override
-  public void setAriaDescribedbyProperty(Element element, IdReference... value) {
-    Property.DESCRIBEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaDisabledState(Element element, boolean value) {
-    State.DISABLED.set(element, value);
-  }
-
-  @Override
-  public void setAriaDropeffectProperty(Element element, DropeffectValue... value) {
-    Property.DROPEFFECT.set(element, value);
-  }
-
-  @Override
   public void setAriaExpandedState(Element element, ExpandedValue value) {
     State.EXPANDED.set(element, value);
   }
-
-  @Override
-  public void setAriaFlowtoProperty(Element element, IdReference... value) {
-    Property.FLOWTO.set(element, value);
-  }
-
-  @Override
-  public void setAriaGrabbedState(Element element, GrabbedValue value) {
-    State.GRABBED.set(element, value);
-  }
-
-  @Override
-  public void setAriaHaspopupProperty(Element element, boolean value) {
-    Property.HASPOPUP.set(element, value);
-  }
-
-  @Override
-  public void setAriaHiddenState(Element element, boolean value) {
-    State.HIDDEN.set(element, value);
-  }
-
-  @Override
-  public void setAriaInvalidState(Element element, InvalidValue value) {
-    State.INVALID.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelledbyProperty(Element element, IdReference... value) {
-    Property.LABELLEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelProperty(Element element, String value) {
-    Property.LABEL.set(element, value);
-  }
-
-  @Override
-  public void setAriaLiveProperty(Element element, LiveValue value) {
-    Property.LIVE.set(element, value);
-  }
-
-  @Override
-  public void setAriaOwnsProperty(Element element, IdReference... value) {
-    Property.OWNS.set(element, value);
-  }
-
-  @Override
-  public void setAriaRelevantProperty(Element element, RelevantValue... value) {
-    Property.RELEVANT.set(element, value);
-  }
-
-  @Override
-  public void setTabindexExtraAttribute(Element element, int value) {
-    ExtraAttribute.TABINDEX.set(element, value);
-  }
 }
diff --git a/user/src/com/google/gwt/aria/client/RowheaderRoleImpl.java b/user/src/com/google/gwt/aria/client/RowheaderRoleImpl.java
index 6e16a37..2403eba 100644
--- a/user/src/com/google/gwt/aria/client/RowheaderRoleImpl.java
+++ b/user/src/com/google/gwt/aria/client/RowheaderRoleImpl.java
@@ -28,96 +28,16 @@
   }
 
   @Override
-  public String getAriaAtomicProperty(Element element) {
-    return Property.ATOMIC.get(element);
-  }
-
-  @Override
-  public String getAriaBusyState(Element element) {
-    return State.BUSY.get(element);
-  }
-
-  @Override
-  public String getAriaControlsProperty(Element element) {
-    return Property.CONTROLS.get(element);
-  }
-
-  @Override
-  public String getAriaDescribedbyProperty(Element element) {
-    return Property.DESCRIBEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaDisabledState(Element element) {
-    return State.DISABLED.get(element);
-  }
-
-  @Override
-  public String getAriaDropeffectProperty(Element element) {
-    return Property.DROPEFFECT.get(element);
-  }
-
-  @Override
   public String getAriaExpandedState(Element element) {
     return State.EXPANDED.get(element);
   }
 
   @Override
-  public String getAriaFlowtoProperty(Element element) {
-    return Property.FLOWTO.get(element);
-  }
-
-  @Override
-  public String getAriaGrabbedState(Element element) {
-    return State.GRABBED.get(element);
-  }
-
-  @Override
-  public String getAriaHaspopupProperty(Element element) {
-    return Property.HASPOPUP.get(element);
-  }
-
-  @Override
-  public String getAriaHiddenState(Element element) {
-    return State.HIDDEN.get(element);
-  }
-
-  @Override
-  public String getAriaInvalidState(Element element) {
-    return State.INVALID.get(element);
-  }
-
-  @Override
-  public String getAriaLabelledbyProperty(Element element) {
-    return Property.LABELLEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaLabelProperty(Element element) {
-    return Property.LABEL.get(element);
-  }
-
-  @Override
-  public String getAriaLiveProperty(Element element) {
-    return Property.LIVE.get(element);
-  }
-
-  @Override
-  public String getAriaOwnsProperty(Element element) {
-    return Property.OWNS.get(element);
-  }
-
-  @Override
   public String getAriaReadonlyProperty(Element element) {
     return Property.READONLY.get(element);
   }
 
   @Override
-  public String getAriaRelevantProperty(Element element) {
-    return Property.RELEVANT.get(element);
-  }
-
-  @Override
   public String getAriaRequiredProperty(Element element) {
     return Property.REQUIRED.get(element);
   }
@@ -133,101 +53,16 @@
   }
 
   @Override
-  public String getTabindexExtraAttribute(Element element) {
-    return ExtraAttribute.TABINDEX.get(element);
-  }
-
-  @Override
-  public void removeAriaAtomicProperty(Element element) {
-    Property.ATOMIC.remove(element);
-  }
-
-  @Override
-  public void removeAriaBusyState(Element element) {
-    State.BUSY.remove(element);
-  }
-
-  @Override
-  public void removeAriaControlsProperty(Element element) {
-    Property.CONTROLS.remove(element);
-  }
-
-  @Override
-  public void removeAriaDescribedbyProperty(Element element) {
-    Property.DESCRIBEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaDisabledState(Element element) {
-    State.DISABLED.remove(element);
-  }
-
-  @Override
-  public void removeAriaDropeffectProperty(Element element) {
-    Property.DROPEFFECT.remove(element);
-  }
-
-  @Override
   public void removeAriaExpandedState(Element element) {
     State.EXPANDED.remove(element);
   }
 
   @Override
-  public void removeAriaFlowtoProperty(Element element) {
-    Property.FLOWTO.remove(element);
-  }
-
-  @Override
-  public void removeAriaGrabbedState(Element element) {
-    State.GRABBED.remove(element);
-  }
-
-  @Override
-  public void removeAriaHaspopupProperty(Element element) {
-    Property.HASPOPUP.remove(element);
-  }
-
-  @Override
-  public void removeAriaHiddenState(Element element) {
-    State.HIDDEN.remove(element);
-  }
-
-  @Override
-  public void removeAriaInvalidState(Element element) {
-    State.INVALID.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelledbyProperty(Element element) {
-    Property.LABELLEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelProperty(Element element) {
-    Property.LABEL.remove(element);
-  }
-
-  @Override
-  public void removeAriaLiveProperty(Element element) {
-    Property.LIVE.remove(element);
-  }
-
-  @Override
-  public void removeAriaOwnsProperty(Element element) {
-    Property.OWNS.remove(element);
-  }
-
-  @Override
   public void removeAriaReadonlyProperty(Element element) {
     Property.READONLY.remove(element);
   }
 
   @Override
-  public void removeAriaRelevantProperty(Element element) {
-    Property.RELEVANT.remove(element);
-  }
-
-  @Override
   public void removeAriaRequiredProperty(Element element) {
     Property.REQUIRED.remove(element);
   }
@@ -243,101 +78,16 @@
   }
 
   @Override
-  public void removeTabindexExtraAttribute(Element element) {
-    ExtraAttribute.TABINDEX.remove(element);
-  }
-
-  @Override
-  public void setAriaAtomicProperty(Element element, boolean value) {
-    Property.ATOMIC.set(element, value);
-  }
-
-  @Override
-  public void setAriaBusyState(Element element, boolean value) {
-    State.BUSY.set(element, value);
-  }
-
-  @Override
-  public void setAriaControlsProperty(Element element, IdReference... value) {
-    Property.CONTROLS.set(element, value);
-  }
-
-  @Override
-  public void setAriaDescribedbyProperty(Element element, IdReference... value) {
-    Property.DESCRIBEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaDisabledState(Element element, boolean value) {
-    State.DISABLED.set(element, value);
-  }
-
-  @Override
-  public void setAriaDropeffectProperty(Element element, DropeffectValue... value) {
-    Property.DROPEFFECT.set(element, value);
-  }
-
-  @Override
   public void setAriaExpandedState(Element element, ExpandedValue value) {
     State.EXPANDED.set(element, value);
   }
 
   @Override
-  public void setAriaFlowtoProperty(Element element, IdReference... value) {
-    Property.FLOWTO.set(element, value);
-  }
-
-  @Override
-  public void setAriaGrabbedState(Element element, GrabbedValue value) {
-    State.GRABBED.set(element, value);
-  }
-
-  @Override
-  public void setAriaHaspopupProperty(Element element, boolean value) {
-    Property.HASPOPUP.set(element, value);
-  }
-
-  @Override
-  public void setAriaHiddenState(Element element, boolean value) {
-    State.HIDDEN.set(element, value);
-  }
-
-  @Override
-  public void setAriaInvalidState(Element element, InvalidValue value) {
-    State.INVALID.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelledbyProperty(Element element, IdReference... value) {
-    Property.LABELLEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelProperty(Element element, String value) {
-    Property.LABEL.set(element, value);
-  }
-
-  @Override
-  public void setAriaLiveProperty(Element element, LiveValue value) {
-    Property.LIVE.set(element, value);
-  }
-
-  @Override
-  public void setAriaOwnsProperty(Element element, IdReference... value) {
-    Property.OWNS.set(element, value);
-  }
-
-  @Override
   public void setAriaReadonlyProperty(Element element, boolean value) {
     Property.READONLY.set(element, value);
   }
 
   @Override
-  public void setAriaRelevantProperty(Element element, RelevantValue... value) {
-    Property.RELEVANT.set(element, value);
-  }
-
-  @Override
   public void setAriaRequiredProperty(Element element, boolean value) {
     Property.REQUIRED.set(element, value);
   }
@@ -351,9 +101,4 @@
   public void setAriaSortProperty(Element element, SortValue value) {
     Property.SORT.set(element, value);
   }
-
-  @Override
-  public void setTabindexExtraAttribute(Element element, int value) {
-    ExtraAttribute.TABINDEX.set(element, value);
-  }
 }
diff --git a/user/src/com/google/gwt/aria/client/ScrollbarRoleImpl.java b/user/src/com/google/gwt/aria/client/ScrollbarRoleImpl.java
index 6b677e0..b18e79d 100644
--- a/user/src/com/google/gwt/aria/client/ScrollbarRoleImpl.java
+++ b/user/src/com/google/gwt/aria/client/ScrollbarRoleImpl.java
@@ -28,91 +28,16 @@
   }
 
   @Override
-  public String getAriaAtomicProperty(Element element) {
-    return Property.ATOMIC.get(element);
-  }
-
-  @Override
-  public String getAriaBusyState(Element element) {
-    return State.BUSY.get(element);
-  }
-
-  @Override
   public String getAriaControlsProperty(Element element) {
     return Property.CONTROLS.get(element);
   }
 
   @Override
-  public String getAriaDescribedbyProperty(Element element) {
-    return Property.DESCRIBEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaDisabledState(Element element) {
-    return State.DISABLED.get(element);
-  }
-
-  @Override
-  public String getAriaDropeffectProperty(Element element) {
-    return Property.DROPEFFECT.get(element);
-  }
-
-  @Override
-  public String getAriaFlowtoProperty(Element element) {
-    return Property.FLOWTO.get(element);
-  }
-
-  @Override
-  public String getAriaGrabbedState(Element element) {
-    return State.GRABBED.get(element);
-  }
-
-  @Override
-  public String getAriaHaspopupProperty(Element element) {
-    return Property.HASPOPUP.get(element);
-  }
-
-  @Override
-  public String getAriaHiddenState(Element element) {
-    return State.HIDDEN.get(element);
-  }
-
-  @Override
-  public String getAriaInvalidState(Element element) {
-    return State.INVALID.get(element);
-  }
-
-  @Override
-  public String getAriaLabelledbyProperty(Element element) {
-    return Property.LABELLEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaLabelProperty(Element element) {
-    return Property.LABEL.get(element);
-  }
-
-  @Override
-  public String getAriaLiveProperty(Element element) {
-    return Property.LIVE.get(element);
-  }
-
-  @Override
   public String getAriaOrientationProperty(Element element) {
     return Property.ORIENTATION.get(element);
   }
 
   @Override
-  public String getAriaOwnsProperty(Element element) {
-    return Property.OWNS.get(element);
-  }
-
-  @Override
-  public String getAriaRelevantProperty(Element element) {
-    return Property.RELEVANT.get(element);
-  }
-
-  @Override
   public String getAriaValuemaxProperty(Element element) {
     return Property.VALUEMAX.get(element);
   }
@@ -133,96 +58,16 @@
   }
 
   @Override
-  public String getTabindexExtraAttribute(Element element) {
-    return ExtraAttribute.TABINDEX.get(element);
-  }
-
-  @Override
-  public void removeAriaAtomicProperty(Element element) {
-    Property.ATOMIC.remove(element);
-  }
-
-  @Override
-  public void removeAriaBusyState(Element element) {
-    State.BUSY.remove(element);
-  }
-
-  @Override
   public void removeAriaControlsProperty(Element element) {
     Property.CONTROLS.remove(element);
   }
 
   @Override
-  public void removeAriaDescribedbyProperty(Element element) {
-    Property.DESCRIBEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaDisabledState(Element element) {
-    State.DISABLED.remove(element);
-  }
-
-  @Override
-  public void removeAriaDropeffectProperty(Element element) {
-    Property.DROPEFFECT.remove(element);
-  }
-
-  @Override
-  public void removeAriaFlowtoProperty(Element element) {
-    Property.FLOWTO.remove(element);
-  }
-
-  @Override
-  public void removeAriaGrabbedState(Element element) {
-    State.GRABBED.remove(element);
-  }
-
-  @Override
-  public void removeAriaHaspopupProperty(Element element) {
-    Property.HASPOPUP.remove(element);
-  }
-
-  @Override
-  public void removeAriaHiddenState(Element element) {
-    State.HIDDEN.remove(element);
-  }
-
-  @Override
-  public void removeAriaInvalidState(Element element) {
-    State.INVALID.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelledbyProperty(Element element) {
-    Property.LABELLEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelProperty(Element element) {
-    Property.LABEL.remove(element);
-  }
-
-  @Override
-  public void removeAriaLiveProperty(Element element) {
-    Property.LIVE.remove(element);
-  }
-
-  @Override
   public void removeAriaOrientationProperty(Element element) {
     Property.ORIENTATION.remove(element);
   }
 
   @Override
-  public void removeAriaOwnsProperty(Element element) {
-    Property.OWNS.remove(element);
-  }
-
-  @Override
-  public void removeAriaRelevantProperty(Element element) {
-    Property.RELEVANT.remove(element);
-  }
-
-  @Override
   public void removeAriaValuemaxProperty(Element element) {
     Property.VALUEMAX.remove(element);
   }
@@ -243,96 +88,16 @@
   }
 
   @Override
-  public void removeTabindexExtraAttribute(Element element) {
-    ExtraAttribute.TABINDEX.remove(element);
-  }
-
-  @Override
-  public void setAriaAtomicProperty(Element element, boolean value) {
-    Property.ATOMIC.set(element, value);
-  }
-
-  @Override
-  public void setAriaBusyState(Element element, boolean value) {
-    State.BUSY.set(element, value);
-  }
-
-  @Override
   public void setAriaControlsProperty(Element element, IdReference... value) {
     Property.CONTROLS.set(element, value);
   }
 
   @Override
-  public void setAriaDescribedbyProperty(Element element, IdReference... value) {
-    Property.DESCRIBEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaDisabledState(Element element, boolean value) {
-    State.DISABLED.set(element, value);
-  }
-
-  @Override
-  public void setAriaDropeffectProperty(Element element, DropeffectValue... value) {
-    Property.DROPEFFECT.set(element, value);
-  }
-
-  @Override
-  public void setAriaFlowtoProperty(Element element, IdReference... value) {
-    Property.FLOWTO.set(element, value);
-  }
-
-  @Override
-  public void setAriaGrabbedState(Element element, GrabbedValue value) {
-    State.GRABBED.set(element, value);
-  }
-
-  @Override
-  public void setAriaHaspopupProperty(Element element, boolean value) {
-    Property.HASPOPUP.set(element, value);
-  }
-
-  @Override
-  public void setAriaHiddenState(Element element, boolean value) {
-    State.HIDDEN.set(element, value);
-  }
-
-  @Override
-  public void setAriaInvalidState(Element element, InvalidValue value) {
-    State.INVALID.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelledbyProperty(Element element, IdReference... value) {
-    Property.LABELLEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelProperty(Element element, String value) {
-    Property.LABEL.set(element, value);
-  }
-
-  @Override
-  public void setAriaLiveProperty(Element element, LiveValue value) {
-    Property.LIVE.set(element, value);
-  }
-
-  @Override
   public void setAriaOrientationProperty(Element element, OrientationValue value) {
     Property.ORIENTATION.set(element, value);
   }
 
   @Override
-  public void setAriaOwnsProperty(Element element, IdReference... value) {
-    Property.OWNS.set(element, value);
-  }
-
-  @Override
-  public void setAriaRelevantProperty(Element element, RelevantValue... value) {
-    Property.RELEVANT.set(element, value);
-  }
-
-  @Override
   public void setAriaValuemaxProperty(Element element, Number value) {
     Property.VALUEMAX.set(element, value);
   }
@@ -351,9 +116,4 @@
   public void setAriaValuetextProperty(Element element, String value) {
     Property.VALUETEXT.set(element, value);
   }
-
-  @Override
-  public void setTabindexExtraAttribute(Element element, int value) {
-    ExtraAttribute.TABINDEX.set(element, value);
-  }
 }
diff --git a/user/src/com/google/gwt/aria/client/SearchRole.java b/user/src/com/google/gwt/aria/client/SearchRole.java
index 1cd92f7..e73d414 100644
--- a/user/src/com/google/gwt/aria/client/SearchRole.java
+++ b/user/src/com/google/gwt/aria/client/SearchRole.java
@@ -17,7 +17,6 @@
 // This is auto-generated code.  Do not manually edit! //
 /////////////////////////////////////////////////////////
 
-
 /**
  * A type that represents the <a href="http://www.w3.org/TR/wai-aria/roles#search">search</a>
  * role in the ARIA specification.
diff --git a/user/src/com/google/gwt/aria/client/SearchRoleImpl.java b/user/src/com/google/gwt/aria/client/SearchRoleImpl.java
index 2a6fcaf..5704bec 100644
--- a/user/src/com/google/gwt/aria/client/SearchRoleImpl.java
+++ b/user/src/com/google/gwt/aria/client/SearchRoleImpl.java
@@ -28,272 +28,17 @@
   }
 
   @Override
-  public String getAriaAtomicProperty(Element element) {
-    return Property.ATOMIC.get(element);
-  }
-
-  @Override
-  public String getAriaBusyState(Element element) {
-    return State.BUSY.get(element);
-  }
-
-  @Override
-  public String getAriaControlsProperty(Element element) {
-    return Property.CONTROLS.get(element);
-  }
-
-  @Override
-  public String getAriaDescribedbyProperty(Element element) {
-    return Property.DESCRIBEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaDisabledState(Element element) {
-    return State.DISABLED.get(element);
-  }
-
-  @Override
-  public String getAriaDropeffectProperty(Element element) {
-    return Property.DROPEFFECT.get(element);
-  }
-
-  @Override
   public String getAriaExpandedState(Element element) {
     return State.EXPANDED.get(element);
   }
 
   @Override
-  public String getAriaFlowtoProperty(Element element) {
-    return Property.FLOWTO.get(element);
-  }
-
-  @Override
-  public String getAriaGrabbedState(Element element) {
-    return State.GRABBED.get(element);
-  }
-
-  @Override
-  public String getAriaHaspopupProperty(Element element) {
-    return Property.HASPOPUP.get(element);
-  }
-
-  @Override
-  public String getAriaHiddenState(Element element) {
-    return State.HIDDEN.get(element);
-  }
-
-  @Override
-  public String getAriaInvalidState(Element element) {
-    return State.INVALID.get(element);
-  }
-
-  @Override
-  public String getAriaLabelledbyProperty(Element element) {
-    return Property.LABELLEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaLabelProperty(Element element) {
-    return Property.LABEL.get(element);
-  }
-
-  @Override
-  public String getAriaLiveProperty(Element element) {
-    return Property.LIVE.get(element);
-  }
-
-  @Override
-  public String getAriaOwnsProperty(Element element) {
-    return Property.OWNS.get(element);
-  }
-
-  @Override
-  public String getAriaRelevantProperty(Element element) {
-    return Property.RELEVANT.get(element);
-  }
-
-  @Override
-  public String getTabindexExtraAttribute(Element element) {
-    return ExtraAttribute.TABINDEX.get(element);
-  }
-
-  @Override
-  public void removeAriaAtomicProperty(Element element) {
-    Property.ATOMIC.remove(element);
-  }
-
-  @Override
-  public void removeAriaBusyState(Element element) {
-    State.BUSY.remove(element);
-  }
-
-  @Override
-  public void removeAriaControlsProperty(Element element) {
-    Property.CONTROLS.remove(element);
-  }
-
-  @Override
-  public void removeAriaDescribedbyProperty(Element element) {
-    Property.DESCRIBEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaDisabledState(Element element) {
-    State.DISABLED.remove(element);
-  }
-
-  @Override
-  public void removeAriaDropeffectProperty(Element element) {
-    Property.DROPEFFECT.remove(element);
-  }
-
-  @Override
   public void removeAriaExpandedState(Element element) {
     State.EXPANDED.remove(element);
   }
 
   @Override
-  public void removeAriaFlowtoProperty(Element element) {
-    Property.FLOWTO.remove(element);
-  }
-
-  @Override
-  public void removeAriaGrabbedState(Element element) {
-    State.GRABBED.remove(element);
-  }
-
-  @Override
-  public void removeAriaHaspopupProperty(Element element) {
-    Property.HASPOPUP.remove(element);
-  }
-
-  @Override
-  public void removeAriaHiddenState(Element element) {
-    State.HIDDEN.remove(element);
-  }
-
-  @Override
-  public void removeAriaInvalidState(Element element) {
-    State.INVALID.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelledbyProperty(Element element) {
-    Property.LABELLEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelProperty(Element element) {
-    Property.LABEL.remove(element);
-  }
-
-  @Override
-  public void removeAriaLiveProperty(Element element) {
-    Property.LIVE.remove(element);
-  }
-
-  @Override
-  public void removeAriaOwnsProperty(Element element) {
-    Property.OWNS.remove(element);
-  }
-
-  @Override
-  public void removeAriaRelevantProperty(Element element) {
-    Property.RELEVANT.remove(element);
-  }
-
-  @Override
-  public void removeTabindexExtraAttribute(Element element) {
-    ExtraAttribute.TABINDEX.remove(element);
-  }
-
-  @Override
-  public void setAriaAtomicProperty(Element element, boolean value) {
-    Property.ATOMIC.set(element, value);
-  }
-
-  @Override
-  public void setAriaBusyState(Element element, boolean value) {
-    State.BUSY.set(element, value);
-  }
-
-  @Override
-  public void setAriaControlsProperty(Element element, IdReference... value) {
-    Property.CONTROLS.set(element, value);
-  }
-
-  @Override
-  public void setAriaDescribedbyProperty(Element element, IdReference... value) {
-    Property.DESCRIBEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaDisabledState(Element element, boolean value) {
-    State.DISABLED.set(element, value);
-  }
-
-  @Override
-  public void setAriaDropeffectProperty(Element element, DropeffectValue... value) {
-    Property.DROPEFFECT.set(element, value);
-  }
-
-  @Override
   public void setAriaExpandedState(Element element, ExpandedValue value) {
     State.EXPANDED.set(element, value);
   }
-
-  @Override
-  public void setAriaFlowtoProperty(Element element, IdReference... value) {
-    Property.FLOWTO.set(element, value);
-  }
-
-  @Override
-  public void setAriaGrabbedState(Element element, GrabbedValue value) {
-    State.GRABBED.set(element, value);
-  }
-
-  @Override
-  public void setAriaHaspopupProperty(Element element, boolean value) {
-    Property.HASPOPUP.set(element, value);
-  }
-
-  @Override
-  public void setAriaHiddenState(Element element, boolean value) {
-    State.HIDDEN.set(element, value);
-  }
-
-  @Override
-  public void setAriaInvalidState(Element element, InvalidValue value) {
-    State.INVALID.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelledbyProperty(Element element, IdReference... value) {
-    Property.LABELLEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelProperty(Element element, String value) {
-    Property.LABEL.set(element, value);
-  }
-
-  @Override
-  public void setAriaLiveProperty(Element element, LiveValue value) {
-    Property.LIVE.set(element, value);
-  }
-
-  @Override
-  public void setAriaOwnsProperty(Element element, IdReference... value) {
-    Property.OWNS.set(element, value);
-  }
-
-  @Override
-  public void setAriaRelevantProperty(Element element, RelevantValue... value) {
-    Property.RELEVANT.set(element, value);
-  }
-
-  @Override
-  public void setTabindexExtraAttribute(Element element, int value) {
-    ExtraAttribute.TABINDEX.set(element, value);
-  }
 }
diff --git a/user/src/com/google/gwt/aria/client/SelectRole.java b/user/src/com/google/gwt/aria/client/SelectRole.java
index 22de0db..99db605 100644
--- a/user/src/com/google/gwt/aria/client/SelectRole.java
+++ b/user/src/com/google/gwt/aria/client/SelectRole.java
@@ -17,7 +17,6 @@
 // This is auto-generated code.  Do not manually edit! //
 /////////////////////////////////////////////////////////
 
-
 /**
  * A type that represents the <a href="http://www.w3.org/TR/wai-aria/roles#select">select</a>
  * role in the ARIA specification.
diff --git a/user/src/com/google/gwt/aria/client/SeparatorRoleImpl.java b/user/src/com/google/gwt/aria/client/SeparatorRoleImpl.java
index dd75693..9fa1cda 100644
--- a/user/src/com/google/gwt/aria/client/SeparatorRoleImpl.java
+++ b/user/src/com/google/gwt/aria/client/SeparatorRoleImpl.java
@@ -28,287 +28,32 @@
   }
 
   @Override
-  public String getAriaAtomicProperty(Element element) {
-    return Property.ATOMIC.get(element);
-  }
-
-  @Override
-  public String getAriaBusyState(Element element) {
-    return State.BUSY.get(element);
-  }
-
-  @Override
-  public String getAriaControlsProperty(Element element) {
-    return Property.CONTROLS.get(element);
-  }
-
-  @Override
-  public String getAriaDescribedbyProperty(Element element) {
-    return Property.DESCRIBEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaDisabledState(Element element) {
-    return State.DISABLED.get(element);
-  }
-
-  @Override
-  public String getAriaDropeffectProperty(Element element) {
-    return Property.DROPEFFECT.get(element);
-  }
-
-  @Override
   public String getAriaExpandedState(Element element) {
     return State.EXPANDED.get(element);
   }
 
   @Override
-  public String getAriaFlowtoProperty(Element element) {
-    return Property.FLOWTO.get(element);
-  }
-
-  @Override
-  public String getAriaGrabbedState(Element element) {
-    return State.GRABBED.get(element);
-  }
-
-  @Override
-  public String getAriaHaspopupProperty(Element element) {
-    return Property.HASPOPUP.get(element);
-  }
-
-  @Override
-  public String getAriaHiddenState(Element element) {
-    return State.HIDDEN.get(element);
-  }
-
-  @Override
-  public String getAriaInvalidState(Element element) {
-    return State.INVALID.get(element);
-  }
-
-  @Override
-  public String getAriaLabelledbyProperty(Element element) {
-    return Property.LABELLEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaLabelProperty(Element element) {
-    return Property.LABEL.get(element);
-  }
-
-  @Override
-  public String getAriaLiveProperty(Element element) {
-    return Property.LIVE.get(element);
-  }
-
-  @Override
   public String getAriaOrientationProperty(Element element) {
     return Property.ORIENTATION.get(element);
   }
 
   @Override
-  public String getAriaOwnsProperty(Element element) {
-    return Property.OWNS.get(element);
-  }
-
-  @Override
-  public String getAriaRelevantProperty(Element element) {
-    return Property.RELEVANT.get(element);
-  }
-
-  @Override
-  public String getTabindexExtraAttribute(Element element) {
-    return ExtraAttribute.TABINDEX.get(element);
-  }
-
-  @Override
-  public void removeAriaAtomicProperty(Element element) {
-    Property.ATOMIC.remove(element);
-  }
-
-  @Override
-  public void removeAriaBusyState(Element element) {
-    State.BUSY.remove(element);
-  }
-
-  @Override
-  public void removeAriaControlsProperty(Element element) {
-    Property.CONTROLS.remove(element);
-  }
-
-  @Override
-  public void removeAriaDescribedbyProperty(Element element) {
-    Property.DESCRIBEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaDisabledState(Element element) {
-    State.DISABLED.remove(element);
-  }
-
-  @Override
-  public void removeAriaDropeffectProperty(Element element) {
-    Property.DROPEFFECT.remove(element);
-  }
-
-  @Override
   public void removeAriaExpandedState(Element element) {
     State.EXPANDED.remove(element);
   }
 
   @Override
-  public void removeAriaFlowtoProperty(Element element) {
-    Property.FLOWTO.remove(element);
-  }
-
-  @Override
-  public void removeAriaGrabbedState(Element element) {
-    State.GRABBED.remove(element);
-  }
-
-  @Override
-  public void removeAriaHaspopupProperty(Element element) {
-    Property.HASPOPUP.remove(element);
-  }
-
-  @Override
-  public void removeAriaHiddenState(Element element) {
-    State.HIDDEN.remove(element);
-  }
-
-  @Override
-  public void removeAriaInvalidState(Element element) {
-    State.INVALID.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelledbyProperty(Element element) {
-    Property.LABELLEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelProperty(Element element) {
-    Property.LABEL.remove(element);
-  }
-
-  @Override
-  public void removeAriaLiveProperty(Element element) {
-    Property.LIVE.remove(element);
-  }
-
-  @Override
   public void removeAriaOrientationProperty(Element element) {
     Property.ORIENTATION.remove(element);
   }
 
   @Override
-  public void removeAriaOwnsProperty(Element element) {
-    Property.OWNS.remove(element);
-  }
-
-  @Override
-  public void removeAriaRelevantProperty(Element element) {
-    Property.RELEVANT.remove(element);
-  }
-
-  @Override
-  public void removeTabindexExtraAttribute(Element element) {
-    ExtraAttribute.TABINDEX.remove(element);
-  }
-
-  @Override
-  public void setAriaAtomicProperty(Element element, boolean value) {
-    Property.ATOMIC.set(element, value);
-  }
-
-  @Override
-  public void setAriaBusyState(Element element, boolean value) {
-    State.BUSY.set(element, value);
-  }
-
-  @Override
-  public void setAriaControlsProperty(Element element, IdReference... value) {
-    Property.CONTROLS.set(element, value);
-  }
-
-  @Override
-  public void setAriaDescribedbyProperty(Element element, IdReference... value) {
-    Property.DESCRIBEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaDisabledState(Element element, boolean value) {
-    State.DISABLED.set(element, value);
-  }
-
-  @Override
-  public void setAriaDropeffectProperty(Element element, DropeffectValue... value) {
-    Property.DROPEFFECT.set(element, value);
-  }
-
-  @Override
   public void setAriaExpandedState(Element element, ExpandedValue value) {
     State.EXPANDED.set(element, value);
   }
 
   @Override
-  public void setAriaFlowtoProperty(Element element, IdReference... value) {
-    Property.FLOWTO.set(element, value);
-  }
-
-  @Override
-  public void setAriaGrabbedState(Element element, GrabbedValue value) {
-    State.GRABBED.set(element, value);
-  }
-
-  @Override
-  public void setAriaHaspopupProperty(Element element, boolean value) {
-    Property.HASPOPUP.set(element, value);
-  }
-
-  @Override
-  public void setAriaHiddenState(Element element, boolean value) {
-    State.HIDDEN.set(element, value);
-  }
-
-  @Override
-  public void setAriaInvalidState(Element element, InvalidValue value) {
-    State.INVALID.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelledbyProperty(Element element, IdReference... value) {
-    Property.LABELLEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelProperty(Element element, String value) {
-    Property.LABEL.set(element, value);
-  }
-
-  @Override
-  public void setAriaLiveProperty(Element element, LiveValue value) {
-    Property.LIVE.set(element, value);
-  }
-
-  @Override
   public void setAriaOrientationProperty(Element element, OrientationValue value) {
     Property.ORIENTATION.set(element, value);
   }
-
-  @Override
-  public void setAriaOwnsProperty(Element element, IdReference... value) {
-    Property.OWNS.set(element, value);
-  }
-
-  @Override
-  public void setAriaRelevantProperty(Element element, RelevantValue... value) {
-    Property.RELEVANT.set(element, value);
-  }
-
-  @Override
-  public void setTabindexExtraAttribute(Element element, int value) {
-    ExtraAttribute.TABINDEX.set(element, value);
-  }
 }
diff --git a/user/src/com/google/gwt/aria/client/SliderRoleImpl.java b/user/src/com/google/gwt/aria/client/SliderRoleImpl.java
index 5ebd768..f64c771 100644
--- a/user/src/com/google/gwt/aria/client/SliderRoleImpl.java
+++ b/user/src/com/google/gwt/aria/client/SliderRoleImpl.java
@@ -28,91 +28,11 @@
   }
 
   @Override
-  public String getAriaAtomicProperty(Element element) {
-    return Property.ATOMIC.get(element);
-  }
-
-  @Override
-  public String getAriaBusyState(Element element) {
-    return State.BUSY.get(element);
-  }
-
-  @Override
-  public String getAriaControlsProperty(Element element) {
-    return Property.CONTROLS.get(element);
-  }
-
-  @Override
-  public String getAriaDescribedbyProperty(Element element) {
-    return Property.DESCRIBEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaDisabledState(Element element) {
-    return State.DISABLED.get(element);
-  }
-
-  @Override
-  public String getAriaDropeffectProperty(Element element) {
-    return Property.DROPEFFECT.get(element);
-  }
-
-  @Override
-  public String getAriaFlowtoProperty(Element element) {
-    return Property.FLOWTO.get(element);
-  }
-
-  @Override
-  public String getAriaGrabbedState(Element element) {
-    return State.GRABBED.get(element);
-  }
-
-  @Override
-  public String getAriaHaspopupProperty(Element element) {
-    return Property.HASPOPUP.get(element);
-  }
-
-  @Override
-  public String getAriaHiddenState(Element element) {
-    return State.HIDDEN.get(element);
-  }
-
-  @Override
-  public String getAriaInvalidState(Element element) {
-    return State.INVALID.get(element);
-  }
-
-  @Override
-  public String getAriaLabelledbyProperty(Element element) {
-    return Property.LABELLEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaLabelProperty(Element element) {
-    return Property.LABEL.get(element);
-  }
-
-  @Override
-  public String getAriaLiveProperty(Element element) {
-    return Property.LIVE.get(element);
-  }
-
-  @Override
   public String getAriaOrientationProperty(Element element) {
     return Property.ORIENTATION.get(element);
   }
 
   @Override
-  public String getAriaOwnsProperty(Element element) {
-    return Property.OWNS.get(element);
-  }
-
-  @Override
-  public String getAriaRelevantProperty(Element element) {
-    return Property.RELEVANT.get(element);
-  }
-
-  @Override
   public String getAriaValuemaxProperty(Element element) {
     return Property.VALUEMAX.get(element);
   }
@@ -133,96 +53,11 @@
   }
 
   @Override
-  public String getTabindexExtraAttribute(Element element) {
-    return ExtraAttribute.TABINDEX.get(element);
-  }
-
-  @Override
-  public void removeAriaAtomicProperty(Element element) {
-    Property.ATOMIC.remove(element);
-  }
-
-  @Override
-  public void removeAriaBusyState(Element element) {
-    State.BUSY.remove(element);
-  }
-
-  @Override
-  public void removeAriaControlsProperty(Element element) {
-    Property.CONTROLS.remove(element);
-  }
-
-  @Override
-  public void removeAriaDescribedbyProperty(Element element) {
-    Property.DESCRIBEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaDisabledState(Element element) {
-    State.DISABLED.remove(element);
-  }
-
-  @Override
-  public void removeAriaDropeffectProperty(Element element) {
-    Property.DROPEFFECT.remove(element);
-  }
-
-  @Override
-  public void removeAriaFlowtoProperty(Element element) {
-    Property.FLOWTO.remove(element);
-  }
-
-  @Override
-  public void removeAriaGrabbedState(Element element) {
-    State.GRABBED.remove(element);
-  }
-
-  @Override
-  public void removeAriaHaspopupProperty(Element element) {
-    Property.HASPOPUP.remove(element);
-  }
-
-  @Override
-  public void removeAriaHiddenState(Element element) {
-    State.HIDDEN.remove(element);
-  }
-
-  @Override
-  public void removeAriaInvalidState(Element element) {
-    State.INVALID.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelledbyProperty(Element element) {
-    Property.LABELLEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelProperty(Element element) {
-    Property.LABEL.remove(element);
-  }
-
-  @Override
-  public void removeAriaLiveProperty(Element element) {
-    Property.LIVE.remove(element);
-  }
-
-  @Override
   public void removeAriaOrientationProperty(Element element) {
     Property.ORIENTATION.remove(element);
   }
 
   @Override
-  public void removeAriaOwnsProperty(Element element) {
-    Property.OWNS.remove(element);
-  }
-
-  @Override
-  public void removeAriaRelevantProperty(Element element) {
-    Property.RELEVANT.remove(element);
-  }
-
-  @Override
   public void removeAriaValuemaxProperty(Element element) {
     Property.VALUEMAX.remove(element);
   }
@@ -243,96 +78,11 @@
   }
 
   @Override
-  public void removeTabindexExtraAttribute(Element element) {
-    ExtraAttribute.TABINDEX.remove(element);
-  }
-
-  @Override
-  public void setAriaAtomicProperty(Element element, boolean value) {
-    Property.ATOMIC.set(element, value);
-  }
-
-  @Override
-  public void setAriaBusyState(Element element, boolean value) {
-    State.BUSY.set(element, value);
-  }
-
-  @Override
-  public void setAriaControlsProperty(Element element, IdReference... value) {
-    Property.CONTROLS.set(element, value);
-  }
-
-  @Override
-  public void setAriaDescribedbyProperty(Element element, IdReference... value) {
-    Property.DESCRIBEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaDisabledState(Element element, boolean value) {
-    State.DISABLED.set(element, value);
-  }
-
-  @Override
-  public void setAriaDropeffectProperty(Element element, DropeffectValue... value) {
-    Property.DROPEFFECT.set(element, value);
-  }
-
-  @Override
-  public void setAriaFlowtoProperty(Element element, IdReference... value) {
-    Property.FLOWTO.set(element, value);
-  }
-
-  @Override
-  public void setAriaGrabbedState(Element element, GrabbedValue value) {
-    State.GRABBED.set(element, value);
-  }
-
-  @Override
-  public void setAriaHaspopupProperty(Element element, boolean value) {
-    Property.HASPOPUP.set(element, value);
-  }
-
-  @Override
-  public void setAriaHiddenState(Element element, boolean value) {
-    State.HIDDEN.set(element, value);
-  }
-
-  @Override
-  public void setAriaInvalidState(Element element, InvalidValue value) {
-    State.INVALID.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelledbyProperty(Element element, IdReference... value) {
-    Property.LABELLEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelProperty(Element element, String value) {
-    Property.LABEL.set(element, value);
-  }
-
-  @Override
-  public void setAriaLiveProperty(Element element, LiveValue value) {
-    Property.LIVE.set(element, value);
-  }
-
-  @Override
   public void setAriaOrientationProperty(Element element, OrientationValue value) {
     Property.ORIENTATION.set(element, value);
   }
 
   @Override
-  public void setAriaOwnsProperty(Element element, IdReference... value) {
-    Property.OWNS.set(element, value);
-  }
-
-  @Override
-  public void setAriaRelevantProperty(Element element, RelevantValue... value) {
-    Property.RELEVANT.set(element, value);
-  }
-
-  @Override
   public void setAriaValuemaxProperty(Element element, Number value) {
     Property.VALUEMAX.set(element, value);
   }
@@ -351,9 +101,4 @@
   public void setAriaValuetextProperty(Element element, String value) {
     Property.VALUETEXT.set(element, value);
   }
-
-  @Override
-  public void setTabindexExtraAttribute(Element element, int value) {
-    ExtraAttribute.TABINDEX.set(element, value);
-  }
 }
diff --git a/user/src/com/google/gwt/aria/client/SpinbuttonRoleImpl.java b/user/src/com/google/gwt/aria/client/SpinbuttonRoleImpl.java
index 872080d..fa74542 100644
--- a/user/src/com/google/gwt/aria/client/SpinbuttonRoleImpl.java
+++ b/user/src/com/google/gwt/aria/client/SpinbuttonRoleImpl.java
@@ -28,86 +28,6 @@
   }
 
   @Override
-  public String getAriaAtomicProperty(Element element) {
-    return Property.ATOMIC.get(element);
-  }
-
-  @Override
-  public String getAriaBusyState(Element element) {
-    return State.BUSY.get(element);
-  }
-
-  @Override
-  public String getAriaControlsProperty(Element element) {
-    return Property.CONTROLS.get(element);
-  }
-
-  @Override
-  public String getAriaDescribedbyProperty(Element element) {
-    return Property.DESCRIBEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaDisabledState(Element element) {
-    return State.DISABLED.get(element);
-  }
-
-  @Override
-  public String getAriaDropeffectProperty(Element element) {
-    return Property.DROPEFFECT.get(element);
-  }
-
-  @Override
-  public String getAriaFlowtoProperty(Element element) {
-    return Property.FLOWTO.get(element);
-  }
-
-  @Override
-  public String getAriaGrabbedState(Element element) {
-    return State.GRABBED.get(element);
-  }
-
-  @Override
-  public String getAriaHaspopupProperty(Element element) {
-    return Property.HASPOPUP.get(element);
-  }
-
-  @Override
-  public String getAriaHiddenState(Element element) {
-    return State.HIDDEN.get(element);
-  }
-
-  @Override
-  public String getAriaInvalidState(Element element) {
-    return State.INVALID.get(element);
-  }
-
-  @Override
-  public String getAriaLabelledbyProperty(Element element) {
-    return Property.LABELLEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaLabelProperty(Element element) {
-    return Property.LABEL.get(element);
-  }
-
-  @Override
-  public String getAriaLiveProperty(Element element) {
-    return Property.LIVE.get(element);
-  }
-
-  @Override
-  public String getAriaOwnsProperty(Element element) {
-    return Property.OWNS.get(element);
-  }
-
-  @Override
-  public String getAriaRelevantProperty(Element element) {
-    return Property.RELEVANT.get(element);
-  }
-
-  @Override
   public String getAriaRequiredProperty(Element element) {
     return Property.REQUIRED.get(element);
   }
@@ -133,91 +53,6 @@
   }
 
   @Override
-  public String getTabindexExtraAttribute(Element element) {
-    return ExtraAttribute.TABINDEX.get(element);
-  }
-
-  @Override
-  public void removeAriaAtomicProperty(Element element) {
-    Property.ATOMIC.remove(element);
-  }
-
-  @Override
-  public void removeAriaBusyState(Element element) {
-    State.BUSY.remove(element);
-  }
-
-  @Override
-  public void removeAriaControlsProperty(Element element) {
-    Property.CONTROLS.remove(element);
-  }
-
-  @Override
-  public void removeAriaDescribedbyProperty(Element element) {
-    Property.DESCRIBEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaDisabledState(Element element) {
-    State.DISABLED.remove(element);
-  }
-
-  @Override
-  public void removeAriaDropeffectProperty(Element element) {
-    Property.DROPEFFECT.remove(element);
-  }
-
-  @Override
-  public void removeAriaFlowtoProperty(Element element) {
-    Property.FLOWTO.remove(element);
-  }
-
-  @Override
-  public void removeAriaGrabbedState(Element element) {
-    State.GRABBED.remove(element);
-  }
-
-  @Override
-  public void removeAriaHaspopupProperty(Element element) {
-    Property.HASPOPUP.remove(element);
-  }
-
-  @Override
-  public void removeAriaHiddenState(Element element) {
-    State.HIDDEN.remove(element);
-  }
-
-  @Override
-  public void removeAriaInvalidState(Element element) {
-    State.INVALID.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelledbyProperty(Element element) {
-    Property.LABELLEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelProperty(Element element) {
-    Property.LABEL.remove(element);
-  }
-
-  @Override
-  public void removeAriaLiveProperty(Element element) {
-    Property.LIVE.remove(element);
-  }
-
-  @Override
-  public void removeAriaOwnsProperty(Element element) {
-    Property.OWNS.remove(element);
-  }
-
-  @Override
-  public void removeAriaRelevantProperty(Element element) {
-    Property.RELEVANT.remove(element);
-  }
-
-  @Override
   public void removeAriaRequiredProperty(Element element) {
     Property.REQUIRED.remove(element);
   }
@@ -243,91 +78,6 @@
   }
 
   @Override
-  public void removeTabindexExtraAttribute(Element element) {
-    ExtraAttribute.TABINDEX.remove(element);
-  }
-
-  @Override
-  public void setAriaAtomicProperty(Element element, boolean value) {
-    Property.ATOMIC.set(element, value);
-  }
-
-  @Override
-  public void setAriaBusyState(Element element, boolean value) {
-    State.BUSY.set(element, value);
-  }
-
-  @Override
-  public void setAriaControlsProperty(Element element, IdReference... value) {
-    Property.CONTROLS.set(element, value);
-  }
-
-  @Override
-  public void setAriaDescribedbyProperty(Element element, IdReference... value) {
-    Property.DESCRIBEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaDisabledState(Element element, boolean value) {
-    State.DISABLED.set(element, value);
-  }
-
-  @Override
-  public void setAriaDropeffectProperty(Element element, DropeffectValue... value) {
-    Property.DROPEFFECT.set(element, value);
-  }
-
-  @Override
-  public void setAriaFlowtoProperty(Element element, IdReference... value) {
-    Property.FLOWTO.set(element, value);
-  }
-
-  @Override
-  public void setAriaGrabbedState(Element element, GrabbedValue value) {
-    State.GRABBED.set(element, value);
-  }
-
-  @Override
-  public void setAriaHaspopupProperty(Element element, boolean value) {
-    Property.HASPOPUP.set(element, value);
-  }
-
-  @Override
-  public void setAriaHiddenState(Element element, boolean value) {
-    State.HIDDEN.set(element, value);
-  }
-
-  @Override
-  public void setAriaInvalidState(Element element, InvalidValue value) {
-    State.INVALID.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelledbyProperty(Element element, IdReference... value) {
-    Property.LABELLEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelProperty(Element element, String value) {
-    Property.LABEL.set(element, value);
-  }
-
-  @Override
-  public void setAriaLiveProperty(Element element, LiveValue value) {
-    Property.LIVE.set(element, value);
-  }
-
-  @Override
-  public void setAriaOwnsProperty(Element element, IdReference... value) {
-    Property.OWNS.set(element, value);
-  }
-
-  @Override
-  public void setAriaRelevantProperty(Element element, RelevantValue... value) {
-    Property.RELEVANT.set(element, value);
-  }
-
-  @Override
   public void setAriaRequiredProperty(Element element, boolean value) {
     Property.REQUIRED.set(element, value);
   }
@@ -351,9 +101,4 @@
   public void setAriaValuetextProperty(Element element, String value) {
     Property.VALUETEXT.set(element, value);
   }
-
-  @Override
-  public void setTabindexExtraAttribute(Element element, int value) {
-    ExtraAttribute.TABINDEX.set(element, value);
-  }
 }
diff --git a/user/src/com/google/gwt/aria/client/StatusRole.java b/user/src/com/google/gwt/aria/client/StatusRole.java
index 9bde7d7..f8b21cf 100644
--- a/user/src/com/google/gwt/aria/client/StatusRole.java
+++ b/user/src/com/google/gwt/aria/client/StatusRole.java
@@ -17,7 +17,6 @@
 // This is auto-generated code.  Do not manually edit! //
 /////////////////////////////////////////////////////////
 
-
 /**
  * A type that represents the <a href="http://www.w3.org/TR/wai-aria/roles#status">status</a>
  * role in the ARIA specification.
diff --git a/user/src/com/google/gwt/aria/client/StatusRoleImpl.java b/user/src/com/google/gwt/aria/client/StatusRoleImpl.java
index 2329a3e..a5a480e 100644
--- a/user/src/com/google/gwt/aria/client/StatusRoleImpl.java
+++ b/user/src/com/google/gwt/aria/client/StatusRoleImpl.java
@@ -28,272 +28,17 @@
   }
 
   @Override
-  public String getAriaAtomicProperty(Element element) {
-    return Property.ATOMIC.get(element);
-  }
-
-  @Override
-  public String getAriaBusyState(Element element) {
-    return State.BUSY.get(element);
-  }
-
-  @Override
-  public String getAriaControlsProperty(Element element) {
-    return Property.CONTROLS.get(element);
-  }
-
-  @Override
-  public String getAriaDescribedbyProperty(Element element) {
-    return Property.DESCRIBEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaDisabledState(Element element) {
-    return State.DISABLED.get(element);
-  }
-
-  @Override
-  public String getAriaDropeffectProperty(Element element) {
-    return Property.DROPEFFECT.get(element);
-  }
-
-  @Override
   public String getAriaExpandedState(Element element) {
     return State.EXPANDED.get(element);
   }
 
   @Override
-  public String getAriaFlowtoProperty(Element element) {
-    return Property.FLOWTO.get(element);
-  }
-
-  @Override
-  public String getAriaGrabbedState(Element element) {
-    return State.GRABBED.get(element);
-  }
-
-  @Override
-  public String getAriaHaspopupProperty(Element element) {
-    return Property.HASPOPUP.get(element);
-  }
-
-  @Override
-  public String getAriaHiddenState(Element element) {
-    return State.HIDDEN.get(element);
-  }
-
-  @Override
-  public String getAriaInvalidState(Element element) {
-    return State.INVALID.get(element);
-  }
-
-  @Override
-  public String getAriaLabelledbyProperty(Element element) {
-    return Property.LABELLEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaLabelProperty(Element element) {
-    return Property.LABEL.get(element);
-  }
-
-  @Override
-  public String getAriaLiveProperty(Element element) {
-    return Property.LIVE.get(element);
-  }
-
-  @Override
-  public String getAriaOwnsProperty(Element element) {
-    return Property.OWNS.get(element);
-  }
-
-  @Override
-  public String getAriaRelevantProperty(Element element) {
-    return Property.RELEVANT.get(element);
-  }
-
-  @Override
-  public String getTabindexExtraAttribute(Element element) {
-    return ExtraAttribute.TABINDEX.get(element);
-  }
-
-  @Override
-  public void removeAriaAtomicProperty(Element element) {
-    Property.ATOMIC.remove(element);
-  }
-
-  @Override
-  public void removeAriaBusyState(Element element) {
-    State.BUSY.remove(element);
-  }
-
-  @Override
-  public void removeAriaControlsProperty(Element element) {
-    Property.CONTROLS.remove(element);
-  }
-
-  @Override
-  public void removeAriaDescribedbyProperty(Element element) {
-    Property.DESCRIBEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaDisabledState(Element element) {
-    State.DISABLED.remove(element);
-  }
-
-  @Override
-  public void removeAriaDropeffectProperty(Element element) {
-    Property.DROPEFFECT.remove(element);
-  }
-
-  @Override
   public void removeAriaExpandedState(Element element) {
     State.EXPANDED.remove(element);
   }
 
   @Override
-  public void removeAriaFlowtoProperty(Element element) {
-    Property.FLOWTO.remove(element);
-  }
-
-  @Override
-  public void removeAriaGrabbedState(Element element) {
-    State.GRABBED.remove(element);
-  }
-
-  @Override
-  public void removeAriaHaspopupProperty(Element element) {
-    Property.HASPOPUP.remove(element);
-  }
-
-  @Override
-  public void removeAriaHiddenState(Element element) {
-    State.HIDDEN.remove(element);
-  }
-
-  @Override
-  public void removeAriaInvalidState(Element element) {
-    State.INVALID.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelledbyProperty(Element element) {
-    Property.LABELLEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelProperty(Element element) {
-    Property.LABEL.remove(element);
-  }
-
-  @Override
-  public void removeAriaLiveProperty(Element element) {
-    Property.LIVE.remove(element);
-  }
-
-  @Override
-  public void removeAriaOwnsProperty(Element element) {
-    Property.OWNS.remove(element);
-  }
-
-  @Override
-  public void removeAriaRelevantProperty(Element element) {
-    Property.RELEVANT.remove(element);
-  }
-
-  @Override
-  public void removeTabindexExtraAttribute(Element element) {
-    ExtraAttribute.TABINDEX.remove(element);
-  }
-
-  @Override
-  public void setAriaAtomicProperty(Element element, boolean value) {
-    Property.ATOMIC.set(element, value);
-  }
-
-  @Override
-  public void setAriaBusyState(Element element, boolean value) {
-    State.BUSY.set(element, value);
-  }
-
-  @Override
-  public void setAriaControlsProperty(Element element, IdReference... value) {
-    Property.CONTROLS.set(element, value);
-  }
-
-  @Override
-  public void setAriaDescribedbyProperty(Element element, IdReference... value) {
-    Property.DESCRIBEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaDisabledState(Element element, boolean value) {
-    State.DISABLED.set(element, value);
-  }
-
-  @Override
-  public void setAriaDropeffectProperty(Element element, DropeffectValue... value) {
-    Property.DROPEFFECT.set(element, value);
-  }
-
-  @Override
   public void setAriaExpandedState(Element element, ExpandedValue value) {
     State.EXPANDED.set(element, value);
   }
-
-  @Override
-  public void setAriaFlowtoProperty(Element element, IdReference... value) {
-    Property.FLOWTO.set(element, value);
-  }
-
-  @Override
-  public void setAriaGrabbedState(Element element, GrabbedValue value) {
-    State.GRABBED.set(element, value);
-  }
-
-  @Override
-  public void setAriaHaspopupProperty(Element element, boolean value) {
-    Property.HASPOPUP.set(element, value);
-  }
-
-  @Override
-  public void setAriaHiddenState(Element element, boolean value) {
-    State.HIDDEN.set(element, value);
-  }
-
-  @Override
-  public void setAriaInvalidState(Element element, InvalidValue value) {
-    State.INVALID.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelledbyProperty(Element element, IdReference... value) {
-    Property.LABELLEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelProperty(Element element, String value) {
-    Property.LABEL.set(element, value);
-  }
-
-  @Override
-  public void setAriaLiveProperty(Element element, LiveValue value) {
-    Property.LIVE.set(element, value);
-  }
-
-  @Override
-  public void setAriaOwnsProperty(Element element, IdReference... value) {
-    Property.OWNS.set(element, value);
-  }
-
-  @Override
-  public void setAriaRelevantProperty(Element element, RelevantValue... value) {
-    Property.RELEVANT.set(element, value);
-  }
-
-  @Override
-  public void setTabindexExtraAttribute(Element element, int value) {
-    ExtraAttribute.TABINDEX.set(element, value);
-  }
 }
diff --git a/user/src/com/google/gwt/aria/client/StructureRole.java b/user/src/com/google/gwt/aria/client/StructureRole.java
index 69a1430..ecbbdce 100644
--- a/user/src/com/google/gwt/aria/client/StructureRole.java
+++ b/user/src/com/google/gwt/aria/client/StructureRole.java
@@ -17,7 +17,6 @@
 // This is auto-generated code.  Do not manually edit! //
 /////////////////////////////////////////////////////////
 
-
 /**
  * A type that represents the <a href="http://www.w3.org/TR/wai-aria/roles#structure">structure</a>
  * role in the ARIA specification.
diff --git a/user/src/com/google/gwt/aria/client/TabRoleImpl.java b/user/src/com/google/gwt/aria/client/TabRoleImpl.java
index 60aef5e..45fbd3d 100644
--- a/user/src/com/google/gwt/aria/client/TabRoleImpl.java
+++ b/user/src/com/google/gwt/aria/client/TabRoleImpl.java
@@ -28,287 +28,32 @@
   }
 
   @Override
-  public String getAriaAtomicProperty(Element element) {
-    return Property.ATOMIC.get(element);
-  }
-
-  @Override
-  public String getAriaBusyState(Element element) {
-    return State.BUSY.get(element);
-  }
-
-  @Override
-  public String getAriaControlsProperty(Element element) {
-    return Property.CONTROLS.get(element);
-  }
-
-  @Override
-  public String getAriaDescribedbyProperty(Element element) {
-    return Property.DESCRIBEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaDisabledState(Element element) {
-    return State.DISABLED.get(element);
-  }
-
-  @Override
-  public String getAriaDropeffectProperty(Element element) {
-    return Property.DROPEFFECT.get(element);
-  }
-
-  @Override
   public String getAriaExpandedState(Element element) {
     return State.EXPANDED.get(element);
   }
 
   @Override
-  public String getAriaFlowtoProperty(Element element) {
-    return Property.FLOWTO.get(element);
-  }
-
-  @Override
-  public String getAriaGrabbedState(Element element) {
-    return State.GRABBED.get(element);
-  }
-
-  @Override
-  public String getAriaHaspopupProperty(Element element) {
-    return Property.HASPOPUP.get(element);
-  }
-
-  @Override
-  public String getAriaHiddenState(Element element) {
-    return State.HIDDEN.get(element);
-  }
-
-  @Override
-  public String getAriaInvalidState(Element element) {
-    return State.INVALID.get(element);
-  }
-
-  @Override
-  public String getAriaLabelledbyProperty(Element element) {
-    return Property.LABELLEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaLabelProperty(Element element) {
-    return Property.LABEL.get(element);
-  }
-
-  @Override
-  public String getAriaLiveProperty(Element element) {
-    return Property.LIVE.get(element);
-  }
-
-  @Override
-  public String getAriaOwnsProperty(Element element) {
-    return Property.OWNS.get(element);
-  }
-
-  @Override
-  public String getAriaRelevantProperty(Element element) {
-    return Property.RELEVANT.get(element);
-  }
-
-  @Override
   public String getAriaSelectedState(Element element) {
     return State.SELECTED.get(element);
   }
 
   @Override
-  public String getTabindexExtraAttribute(Element element) {
-    return ExtraAttribute.TABINDEX.get(element);
-  }
-
-  @Override
-  public void removeAriaAtomicProperty(Element element) {
-    Property.ATOMIC.remove(element);
-  }
-
-  @Override
-  public void removeAriaBusyState(Element element) {
-    State.BUSY.remove(element);
-  }
-
-  @Override
-  public void removeAriaControlsProperty(Element element) {
-    Property.CONTROLS.remove(element);
-  }
-
-  @Override
-  public void removeAriaDescribedbyProperty(Element element) {
-    Property.DESCRIBEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaDisabledState(Element element) {
-    State.DISABLED.remove(element);
-  }
-
-  @Override
-  public void removeAriaDropeffectProperty(Element element) {
-    Property.DROPEFFECT.remove(element);
-  }
-
-  @Override
   public void removeAriaExpandedState(Element element) {
     State.EXPANDED.remove(element);
   }
 
   @Override
-  public void removeAriaFlowtoProperty(Element element) {
-    Property.FLOWTO.remove(element);
-  }
-
-  @Override
-  public void removeAriaGrabbedState(Element element) {
-    State.GRABBED.remove(element);
-  }
-
-  @Override
-  public void removeAriaHaspopupProperty(Element element) {
-    Property.HASPOPUP.remove(element);
-  }
-
-  @Override
-  public void removeAriaHiddenState(Element element) {
-    State.HIDDEN.remove(element);
-  }
-
-  @Override
-  public void removeAriaInvalidState(Element element) {
-    State.INVALID.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelledbyProperty(Element element) {
-    Property.LABELLEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelProperty(Element element) {
-    Property.LABEL.remove(element);
-  }
-
-  @Override
-  public void removeAriaLiveProperty(Element element) {
-    Property.LIVE.remove(element);
-  }
-
-  @Override
-  public void removeAriaOwnsProperty(Element element) {
-    Property.OWNS.remove(element);
-  }
-
-  @Override
-  public void removeAriaRelevantProperty(Element element) {
-    Property.RELEVANT.remove(element);
-  }
-
-  @Override
   public void removeAriaSelectedState(Element element) {
     State.SELECTED.remove(element);
   }
 
   @Override
-  public void removeTabindexExtraAttribute(Element element) {
-    ExtraAttribute.TABINDEX.remove(element);
-  }
-
-  @Override
-  public void setAriaAtomicProperty(Element element, boolean value) {
-    Property.ATOMIC.set(element, value);
-  }
-
-  @Override
-  public void setAriaBusyState(Element element, boolean value) {
-    State.BUSY.set(element, value);
-  }
-
-  @Override
-  public void setAriaControlsProperty(Element element, IdReference... value) {
-    Property.CONTROLS.set(element, value);
-  }
-
-  @Override
-  public void setAriaDescribedbyProperty(Element element, IdReference... value) {
-    Property.DESCRIBEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaDisabledState(Element element, boolean value) {
-    State.DISABLED.set(element, value);
-  }
-
-  @Override
-  public void setAriaDropeffectProperty(Element element, DropeffectValue... value) {
-    Property.DROPEFFECT.set(element, value);
-  }
-
-  @Override
   public void setAriaExpandedState(Element element, ExpandedValue value) {
     State.EXPANDED.set(element, value);
   }
 
   @Override
-  public void setAriaFlowtoProperty(Element element, IdReference... value) {
-    Property.FLOWTO.set(element, value);
-  }
-
-  @Override
-  public void setAriaGrabbedState(Element element, GrabbedValue value) {
-    State.GRABBED.set(element, value);
-  }
-
-  @Override
-  public void setAriaHaspopupProperty(Element element, boolean value) {
-    Property.HASPOPUP.set(element, value);
-  }
-
-  @Override
-  public void setAriaHiddenState(Element element, boolean value) {
-    State.HIDDEN.set(element, value);
-  }
-
-  @Override
-  public void setAriaInvalidState(Element element, InvalidValue value) {
-    State.INVALID.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelledbyProperty(Element element, IdReference... value) {
-    Property.LABELLEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelProperty(Element element, String value) {
-    Property.LABEL.set(element, value);
-  }
-
-  @Override
-  public void setAriaLiveProperty(Element element, LiveValue value) {
-    Property.LIVE.set(element, value);
-  }
-
-  @Override
-  public void setAriaOwnsProperty(Element element, IdReference... value) {
-    Property.OWNS.set(element, value);
-  }
-
-  @Override
-  public void setAriaRelevantProperty(Element element, RelevantValue... value) {
-    Property.RELEVANT.set(element, value);
-  }
-
-  @Override
   public void setAriaSelectedState(Element element, SelectedValue value) {
     State.SELECTED.set(element, value);
   }
-
-  @Override
-  public void setTabindexExtraAttribute(Element element, int value) {
-    ExtraAttribute.TABINDEX.set(element, value);
-  }
 }
diff --git a/user/src/com/google/gwt/aria/client/TablistRoleImpl.java b/user/src/com/google/gwt/aria/client/TablistRoleImpl.java
index a92be09..eea6f82 100644
--- a/user/src/com/google/gwt/aria/client/TablistRoleImpl.java
+++ b/user/src/com/google/gwt/aria/client/TablistRoleImpl.java
@@ -33,297 +33,42 @@
   }
 
   @Override
-  public String getAriaAtomicProperty(Element element) {
-    return Property.ATOMIC.get(element);
-  }
-
-  @Override
-  public String getAriaBusyState(Element element) {
-    return State.BUSY.get(element);
-  }
-
-  @Override
-  public String getAriaControlsProperty(Element element) {
-    return Property.CONTROLS.get(element);
-  }
-
-  @Override
-  public String getAriaDescribedbyProperty(Element element) {
-    return Property.DESCRIBEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaDisabledState(Element element) {
-    return State.DISABLED.get(element);
-  }
-
-  @Override
-  public String getAriaDropeffectProperty(Element element) {
-    return Property.DROPEFFECT.get(element);
-  }
-
-  @Override
   public String getAriaExpandedState(Element element) {
     return State.EXPANDED.get(element);
   }
 
   @Override
-  public String getAriaFlowtoProperty(Element element) {
-    return Property.FLOWTO.get(element);
-  }
-
-  @Override
-  public String getAriaGrabbedState(Element element) {
-    return State.GRABBED.get(element);
-  }
-
-  @Override
-  public String getAriaHaspopupProperty(Element element) {
-    return Property.HASPOPUP.get(element);
-  }
-
-  @Override
-  public String getAriaHiddenState(Element element) {
-    return State.HIDDEN.get(element);
-  }
-
-  @Override
-  public String getAriaInvalidState(Element element) {
-    return State.INVALID.get(element);
-  }
-
-  @Override
-  public String getAriaLabelledbyProperty(Element element) {
-    return Property.LABELLEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaLabelProperty(Element element) {
-    return Property.LABEL.get(element);
-  }
-
-  @Override
   public String getAriaLevelProperty(Element element) {
     return Property.LEVEL.get(element);
   }
 
   @Override
-  public String getAriaLiveProperty(Element element) {
-    return Property.LIVE.get(element);
-  }
-
-  @Override
-  public String getAriaOwnsProperty(Element element) {
-    return Property.OWNS.get(element);
-  }
-
-  @Override
-  public String getAriaRelevantProperty(Element element) {
-    return Property.RELEVANT.get(element);
-  }
-
-  @Override
-  public String getTabindexExtraAttribute(Element element) {
-    return ExtraAttribute.TABINDEX.get(element);
-  }
-
-  @Override
   public void removeAriaActivedescendantProperty(Element element) {
     Property.ACTIVEDESCENDANT.remove(element);
   }
 
   @Override
-  public void removeAriaAtomicProperty(Element element) {
-    Property.ATOMIC.remove(element);
-  }
-
-  @Override
-  public void removeAriaBusyState(Element element) {
-    State.BUSY.remove(element);
-  }
-
-  @Override
-  public void removeAriaControlsProperty(Element element) {
-    Property.CONTROLS.remove(element);
-  }
-
-  @Override
-  public void removeAriaDescribedbyProperty(Element element) {
-    Property.DESCRIBEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaDisabledState(Element element) {
-    State.DISABLED.remove(element);
-  }
-
-  @Override
-  public void removeAriaDropeffectProperty(Element element) {
-    Property.DROPEFFECT.remove(element);
-  }
-
-  @Override
   public void removeAriaExpandedState(Element element) {
     State.EXPANDED.remove(element);
   }
 
   @Override
-  public void removeAriaFlowtoProperty(Element element) {
-    Property.FLOWTO.remove(element);
-  }
-
-  @Override
-  public void removeAriaGrabbedState(Element element) {
-    State.GRABBED.remove(element);
-  }
-
-  @Override
-  public void removeAriaHaspopupProperty(Element element) {
-    Property.HASPOPUP.remove(element);
-  }
-
-  @Override
-  public void removeAriaHiddenState(Element element) {
-    State.HIDDEN.remove(element);
-  }
-
-  @Override
-  public void removeAriaInvalidState(Element element) {
-    State.INVALID.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelledbyProperty(Element element) {
-    Property.LABELLEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelProperty(Element element) {
-    Property.LABEL.remove(element);
-  }
-
-  @Override
   public void removeAriaLevelProperty(Element element) {
     Property.LEVEL.remove(element);
   }
 
   @Override
-  public void removeAriaLiveProperty(Element element) {
-    Property.LIVE.remove(element);
-  }
-
-  @Override
-  public void removeAriaOwnsProperty(Element element) {
-    Property.OWNS.remove(element);
-  }
-
-  @Override
-  public void removeAriaRelevantProperty(Element element) {
-    Property.RELEVANT.remove(element);
-  }
-
-  @Override
-  public void removeTabindexExtraAttribute(Element element) {
-    ExtraAttribute.TABINDEX.remove(element);
-  }
-
-  @Override
   public void setAriaActivedescendantProperty(Element element, IdReference value) {
     Property.ACTIVEDESCENDANT.set(element, value);
   }
 
   @Override
-  public void setAriaAtomicProperty(Element element, boolean value) {
-    Property.ATOMIC.set(element, value);
-  }
-
-  @Override
-  public void setAriaBusyState(Element element, boolean value) {
-    State.BUSY.set(element, value);
-  }
-
-  @Override
-  public void setAriaControlsProperty(Element element, IdReference... value) {
-    Property.CONTROLS.set(element, value);
-  }
-
-  @Override
-  public void setAriaDescribedbyProperty(Element element, IdReference... value) {
-    Property.DESCRIBEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaDisabledState(Element element, boolean value) {
-    State.DISABLED.set(element, value);
-  }
-
-  @Override
-  public void setAriaDropeffectProperty(Element element, DropeffectValue... value) {
-    Property.DROPEFFECT.set(element, value);
-  }
-
-  @Override
   public void setAriaExpandedState(Element element, ExpandedValue value) {
     State.EXPANDED.set(element, value);
   }
 
   @Override
-  public void setAriaFlowtoProperty(Element element, IdReference... value) {
-    Property.FLOWTO.set(element, value);
-  }
-
-  @Override
-  public void setAriaGrabbedState(Element element, GrabbedValue value) {
-    State.GRABBED.set(element, value);
-  }
-
-  @Override
-  public void setAriaHaspopupProperty(Element element, boolean value) {
-    Property.HASPOPUP.set(element, value);
-  }
-
-  @Override
-  public void setAriaHiddenState(Element element, boolean value) {
-    State.HIDDEN.set(element, value);
-  }
-
-  @Override
-  public void setAriaInvalidState(Element element, InvalidValue value) {
-    State.INVALID.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelledbyProperty(Element element, IdReference... value) {
-    Property.LABELLEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelProperty(Element element, String value) {
-    Property.LABEL.set(element, value);
-  }
-
-  @Override
   public void setAriaLevelProperty(Element element, int value) {
     Property.LEVEL.set(element, value);
   }
-
-  @Override
-  public void setAriaLiveProperty(Element element, LiveValue value) {
-    Property.LIVE.set(element, value);
-  }
-
-  @Override
-  public void setAriaOwnsProperty(Element element, IdReference... value) {
-    Property.OWNS.set(element, value);
-  }
-
-  @Override
-  public void setAriaRelevantProperty(Element element, RelevantValue... value) {
-    Property.RELEVANT.set(element, value);
-  }
-
-  @Override
-  public void setTabindexExtraAttribute(Element element, int value) {
-    ExtraAttribute.TABINDEX.set(element, value);
-  }
 }
diff --git a/user/src/com/google/gwt/aria/client/TabpanelRole.java b/user/src/com/google/gwt/aria/client/TabpanelRole.java
index 30a8d9a..64f7288 100644
--- a/user/src/com/google/gwt/aria/client/TabpanelRole.java
+++ b/user/src/com/google/gwt/aria/client/TabpanelRole.java
@@ -17,7 +17,6 @@
 // This is auto-generated code.  Do not manually edit! //
 /////////////////////////////////////////////////////////
 
-
 /**
  * A type that represents the <a href="http://www.w3.org/TR/wai-aria/roles#tabpanel">tabpanel</a>
  * role in the ARIA specification.
diff --git a/user/src/com/google/gwt/aria/client/TabpanelRoleImpl.java b/user/src/com/google/gwt/aria/client/TabpanelRoleImpl.java
index 54aaff6..ffee772 100644
--- a/user/src/com/google/gwt/aria/client/TabpanelRoleImpl.java
+++ b/user/src/com/google/gwt/aria/client/TabpanelRoleImpl.java
@@ -28,272 +28,17 @@
   }
 
   @Override
-  public String getAriaAtomicProperty(Element element) {
-    return Property.ATOMIC.get(element);
-  }
-
-  @Override
-  public String getAriaBusyState(Element element) {
-    return State.BUSY.get(element);
-  }
-
-  @Override
-  public String getAriaControlsProperty(Element element) {
-    return Property.CONTROLS.get(element);
-  }
-
-  @Override
-  public String getAriaDescribedbyProperty(Element element) {
-    return Property.DESCRIBEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaDisabledState(Element element) {
-    return State.DISABLED.get(element);
-  }
-
-  @Override
-  public String getAriaDropeffectProperty(Element element) {
-    return Property.DROPEFFECT.get(element);
-  }
-
-  @Override
   public String getAriaExpandedState(Element element) {
     return State.EXPANDED.get(element);
   }
 
   @Override
-  public String getAriaFlowtoProperty(Element element) {
-    return Property.FLOWTO.get(element);
-  }
-
-  @Override
-  public String getAriaGrabbedState(Element element) {
-    return State.GRABBED.get(element);
-  }
-
-  @Override
-  public String getAriaHaspopupProperty(Element element) {
-    return Property.HASPOPUP.get(element);
-  }
-
-  @Override
-  public String getAriaHiddenState(Element element) {
-    return State.HIDDEN.get(element);
-  }
-
-  @Override
-  public String getAriaInvalidState(Element element) {
-    return State.INVALID.get(element);
-  }
-
-  @Override
-  public String getAriaLabelledbyProperty(Element element) {
-    return Property.LABELLEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaLabelProperty(Element element) {
-    return Property.LABEL.get(element);
-  }
-
-  @Override
-  public String getAriaLiveProperty(Element element) {
-    return Property.LIVE.get(element);
-  }
-
-  @Override
-  public String getAriaOwnsProperty(Element element) {
-    return Property.OWNS.get(element);
-  }
-
-  @Override
-  public String getAriaRelevantProperty(Element element) {
-    return Property.RELEVANT.get(element);
-  }
-
-  @Override
-  public String getTabindexExtraAttribute(Element element) {
-    return ExtraAttribute.TABINDEX.get(element);
-  }
-
-  @Override
-  public void removeAriaAtomicProperty(Element element) {
-    Property.ATOMIC.remove(element);
-  }
-
-  @Override
-  public void removeAriaBusyState(Element element) {
-    State.BUSY.remove(element);
-  }
-
-  @Override
-  public void removeAriaControlsProperty(Element element) {
-    Property.CONTROLS.remove(element);
-  }
-
-  @Override
-  public void removeAriaDescribedbyProperty(Element element) {
-    Property.DESCRIBEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaDisabledState(Element element) {
-    State.DISABLED.remove(element);
-  }
-
-  @Override
-  public void removeAriaDropeffectProperty(Element element) {
-    Property.DROPEFFECT.remove(element);
-  }
-
-  @Override
   public void removeAriaExpandedState(Element element) {
     State.EXPANDED.remove(element);
   }
 
   @Override
-  public void removeAriaFlowtoProperty(Element element) {
-    Property.FLOWTO.remove(element);
-  }
-
-  @Override
-  public void removeAriaGrabbedState(Element element) {
-    State.GRABBED.remove(element);
-  }
-
-  @Override
-  public void removeAriaHaspopupProperty(Element element) {
-    Property.HASPOPUP.remove(element);
-  }
-
-  @Override
-  public void removeAriaHiddenState(Element element) {
-    State.HIDDEN.remove(element);
-  }
-
-  @Override
-  public void removeAriaInvalidState(Element element) {
-    State.INVALID.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelledbyProperty(Element element) {
-    Property.LABELLEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelProperty(Element element) {
-    Property.LABEL.remove(element);
-  }
-
-  @Override
-  public void removeAriaLiveProperty(Element element) {
-    Property.LIVE.remove(element);
-  }
-
-  @Override
-  public void removeAriaOwnsProperty(Element element) {
-    Property.OWNS.remove(element);
-  }
-
-  @Override
-  public void removeAriaRelevantProperty(Element element) {
-    Property.RELEVANT.remove(element);
-  }
-
-  @Override
-  public void removeTabindexExtraAttribute(Element element) {
-    ExtraAttribute.TABINDEX.remove(element);
-  }
-
-  @Override
-  public void setAriaAtomicProperty(Element element, boolean value) {
-    Property.ATOMIC.set(element, value);
-  }
-
-  @Override
-  public void setAriaBusyState(Element element, boolean value) {
-    State.BUSY.set(element, value);
-  }
-
-  @Override
-  public void setAriaControlsProperty(Element element, IdReference... value) {
-    Property.CONTROLS.set(element, value);
-  }
-
-  @Override
-  public void setAriaDescribedbyProperty(Element element, IdReference... value) {
-    Property.DESCRIBEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaDisabledState(Element element, boolean value) {
-    State.DISABLED.set(element, value);
-  }
-
-  @Override
-  public void setAriaDropeffectProperty(Element element, DropeffectValue... value) {
-    Property.DROPEFFECT.set(element, value);
-  }
-
-  @Override
   public void setAriaExpandedState(Element element, ExpandedValue value) {
     State.EXPANDED.set(element, value);
   }
-
-  @Override
-  public void setAriaFlowtoProperty(Element element, IdReference... value) {
-    Property.FLOWTO.set(element, value);
-  }
-
-  @Override
-  public void setAriaGrabbedState(Element element, GrabbedValue value) {
-    State.GRABBED.set(element, value);
-  }
-
-  @Override
-  public void setAriaHaspopupProperty(Element element, boolean value) {
-    Property.HASPOPUP.set(element, value);
-  }
-
-  @Override
-  public void setAriaHiddenState(Element element, boolean value) {
-    State.HIDDEN.set(element, value);
-  }
-
-  @Override
-  public void setAriaInvalidState(Element element, InvalidValue value) {
-    State.INVALID.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelledbyProperty(Element element, IdReference... value) {
-    Property.LABELLEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelProperty(Element element, String value) {
-    Property.LABEL.set(element, value);
-  }
-
-  @Override
-  public void setAriaLiveProperty(Element element, LiveValue value) {
-    Property.LIVE.set(element, value);
-  }
-
-  @Override
-  public void setAriaOwnsProperty(Element element, IdReference... value) {
-    Property.OWNS.set(element, value);
-  }
-
-  @Override
-  public void setAriaRelevantProperty(Element element, RelevantValue... value) {
-    Property.RELEVANT.set(element, value);
-  }
-
-  @Override
-  public void setTabindexExtraAttribute(Element element, int value) {
-    ExtraAttribute.TABINDEX.set(element, value);
-  }
 }
diff --git a/user/src/com/google/gwt/aria/client/TextboxRoleImpl.java b/user/src/com/google/gwt/aria/client/TextboxRoleImpl.java
index 88203ad..bb02892 100644
--- a/user/src/com/google/gwt/aria/client/TextboxRoleImpl.java
+++ b/user/src/com/google/gwt/aria/client/TextboxRoleImpl.java
@@ -33,327 +33,72 @@
   }
 
   @Override
-  public String getAriaAtomicProperty(Element element) {
-    return Property.ATOMIC.get(element);
-  }
-
-  @Override
   public String getAriaAutocompleteProperty(Element element) {
     return Property.AUTOCOMPLETE.get(element);
   }
 
   @Override
-  public String getAriaBusyState(Element element) {
-    return State.BUSY.get(element);
-  }
-
-  @Override
-  public String getAriaControlsProperty(Element element) {
-    return Property.CONTROLS.get(element);
-  }
-
-  @Override
-  public String getAriaDescribedbyProperty(Element element) {
-    return Property.DESCRIBEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaDisabledState(Element element) {
-    return State.DISABLED.get(element);
-  }
-
-  @Override
-  public String getAriaDropeffectProperty(Element element) {
-    return Property.DROPEFFECT.get(element);
-  }
-
-  @Override
-  public String getAriaFlowtoProperty(Element element) {
-    return Property.FLOWTO.get(element);
-  }
-
-  @Override
-  public String getAriaGrabbedState(Element element) {
-    return State.GRABBED.get(element);
-  }
-
-  @Override
-  public String getAriaHaspopupProperty(Element element) {
-    return Property.HASPOPUP.get(element);
-  }
-
-  @Override
-  public String getAriaHiddenState(Element element) {
-    return State.HIDDEN.get(element);
-  }
-
-  @Override
-  public String getAriaInvalidState(Element element) {
-    return State.INVALID.get(element);
-  }
-
-  @Override
-  public String getAriaLabelledbyProperty(Element element) {
-    return Property.LABELLEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaLabelProperty(Element element) {
-    return Property.LABEL.get(element);
-  }
-
-  @Override
-  public String getAriaLiveProperty(Element element) {
-    return Property.LIVE.get(element);
-  }
-
-  @Override
   public String getAriaMultilineProperty(Element element) {
     return Property.MULTILINE.get(element);
   }
 
   @Override
-  public String getAriaOwnsProperty(Element element) {
-    return Property.OWNS.get(element);
-  }
-
-  @Override
   public String getAriaReadonlyProperty(Element element) {
     return Property.READONLY.get(element);
   }
 
   @Override
-  public String getAriaRelevantProperty(Element element) {
-    return Property.RELEVANT.get(element);
-  }
-
-  @Override
   public String getAriaRequiredProperty(Element element) {
     return Property.REQUIRED.get(element);
   }
 
   @Override
-  public String getTabindexExtraAttribute(Element element) {
-    return ExtraAttribute.TABINDEX.get(element);
-  }
-
-  @Override
   public void removeAriaActivedescendantProperty(Element element) {
     Property.ACTIVEDESCENDANT.remove(element);
   }
 
   @Override
-  public void removeAriaAtomicProperty(Element element) {
-    Property.ATOMIC.remove(element);
-  }
-
-  @Override
   public void removeAriaAutocompleteProperty(Element element) {
     Property.AUTOCOMPLETE.remove(element);
   }
 
   @Override
-  public void removeAriaBusyState(Element element) {
-    State.BUSY.remove(element);
-  }
-
-  @Override
-  public void removeAriaControlsProperty(Element element) {
-    Property.CONTROLS.remove(element);
-  }
-
-  @Override
-  public void removeAriaDescribedbyProperty(Element element) {
-    Property.DESCRIBEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaDisabledState(Element element) {
-    State.DISABLED.remove(element);
-  }
-
-  @Override
-  public void removeAriaDropeffectProperty(Element element) {
-    Property.DROPEFFECT.remove(element);
-  }
-
-  @Override
-  public void removeAriaFlowtoProperty(Element element) {
-    Property.FLOWTO.remove(element);
-  }
-
-  @Override
-  public void removeAriaGrabbedState(Element element) {
-    State.GRABBED.remove(element);
-  }
-
-  @Override
-  public void removeAriaHaspopupProperty(Element element) {
-    Property.HASPOPUP.remove(element);
-  }
-
-  @Override
-  public void removeAriaHiddenState(Element element) {
-    State.HIDDEN.remove(element);
-  }
-
-  @Override
-  public void removeAriaInvalidState(Element element) {
-    State.INVALID.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelledbyProperty(Element element) {
-    Property.LABELLEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelProperty(Element element) {
-    Property.LABEL.remove(element);
-  }
-
-  @Override
-  public void removeAriaLiveProperty(Element element) {
-    Property.LIVE.remove(element);
-  }
-
-  @Override
   public void removeAriaMultilineProperty(Element element) {
     Property.MULTILINE.remove(element);
   }
 
   @Override
-  public void removeAriaOwnsProperty(Element element) {
-    Property.OWNS.remove(element);
-  }
-
-  @Override
   public void removeAriaReadonlyProperty(Element element) {
     Property.READONLY.remove(element);
   }
 
   @Override
-  public void removeAriaRelevantProperty(Element element) {
-    Property.RELEVANT.remove(element);
-  }
-
-  @Override
   public void removeAriaRequiredProperty(Element element) {
     Property.REQUIRED.remove(element);
   }
 
   @Override
-  public void removeTabindexExtraAttribute(Element element) {
-    ExtraAttribute.TABINDEX.remove(element);
-  }
-
-  @Override
   public void setAriaActivedescendantProperty(Element element, IdReference value) {
     Property.ACTIVEDESCENDANT.set(element, value);
   }
 
   @Override
-  public void setAriaAtomicProperty(Element element, boolean value) {
-    Property.ATOMIC.set(element, value);
-  }
-
-  @Override
   public void setAriaAutocompleteProperty(Element element, AutocompleteValue value) {
     Property.AUTOCOMPLETE.set(element, value);
   }
 
   @Override
-  public void setAriaBusyState(Element element, boolean value) {
-    State.BUSY.set(element, value);
-  }
-
-  @Override
-  public void setAriaControlsProperty(Element element, IdReference... value) {
-    Property.CONTROLS.set(element, value);
-  }
-
-  @Override
-  public void setAriaDescribedbyProperty(Element element, IdReference... value) {
-    Property.DESCRIBEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaDisabledState(Element element, boolean value) {
-    State.DISABLED.set(element, value);
-  }
-
-  @Override
-  public void setAriaDropeffectProperty(Element element, DropeffectValue... value) {
-    Property.DROPEFFECT.set(element, value);
-  }
-
-  @Override
-  public void setAriaFlowtoProperty(Element element, IdReference... value) {
-    Property.FLOWTO.set(element, value);
-  }
-
-  @Override
-  public void setAriaGrabbedState(Element element, GrabbedValue value) {
-    State.GRABBED.set(element, value);
-  }
-
-  @Override
-  public void setAriaHaspopupProperty(Element element, boolean value) {
-    Property.HASPOPUP.set(element, value);
-  }
-
-  @Override
-  public void setAriaHiddenState(Element element, boolean value) {
-    State.HIDDEN.set(element, value);
-  }
-
-  @Override
-  public void setAriaInvalidState(Element element, InvalidValue value) {
-    State.INVALID.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelledbyProperty(Element element, IdReference... value) {
-    Property.LABELLEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelProperty(Element element, String value) {
-    Property.LABEL.set(element, value);
-  }
-
-  @Override
-  public void setAriaLiveProperty(Element element, LiveValue value) {
-    Property.LIVE.set(element, value);
-  }
-
-  @Override
   public void setAriaMultilineProperty(Element element, boolean value) {
     Property.MULTILINE.set(element, value);
   }
 
   @Override
-  public void setAriaOwnsProperty(Element element, IdReference... value) {
-    Property.OWNS.set(element, value);
-  }
-
-  @Override
   public void setAriaReadonlyProperty(Element element, boolean value) {
     Property.READONLY.set(element, value);
   }
 
   @Override
-  public void setAriaRelevantProperty(Element element, RelevantValue... value) {
-    Property.RELEVANT.set(element, value);
-  }
-
-  @Override
   public void setAriaRequiredProperty(Element element, boolean value) {
     Property.REQUIRED.set(element, value);
   }
-
-  @Override
-  public void setTabindexExtraAttribute(Element element, int value) {
-    ExtraAttribute.TABINDEX.set(element, value);
-  }
 }
diff --git a/user/src/com/google/gwt/aria/client/TimerRole.java b/user/src/com/google/gwt/aria/client/TimerRole.java
index 66a9043..96023c1 100644
--- a/user/src/com/google/gwt/aria/client/TimerRole.java
+++ b/user/src/com/google/gwt/aria/client/TimerRole.java
@@ -17,7 +17,6 @@
 // This is auto-generated code.  Do not manually edit! //
 /////////////////////////////////////////////////////////
 
-
 /**
  * A type that represents the <a href="http://www.w3.org/TR/wai-aria/roles#timer">timer</a>
  * role in the ARIA specification.
diff --git a/user/src/com/google/gwt/aria/client/TimerRoleImpl.java b/user/src/com/google/gwt/aria/client/TimerRoleImpl.java
index 4bcb08b..676c778 100644
--- a/user/src/com/google/gwt/aria/client/TimerRoleImpl.java
+++ b/user/src/com/google/gwt/aria/client/TimerRoleImpl.java
@@ -28,272 +28,17 @@
   }
 
   @Override
-  public String getAriaAtomicProperty(Element element) {
-    return Property.ATOMIC.get(element);
-  }
-
-  @Override
-  public String getAriaBusyState(Element element) {
-    return State.BUSY.get(element);
-  }
-
-  @Override
-  public String getAriaControlsProperty(Element element) {
-    return Property.CONTROLS.get(element);
-  }
-
-  @Override
-  public String getAriaDescribedbyProperty(Element element) {
-    return Property.DESCRIBEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaDisabledState(Element element) {
-    return State.DISABLED.get(element);
-  }
-
-  @Override
-  public String getAriaDropeffectProperty(Element element) {
-    return Property.DROPEFFECT.get(element);
-  }
-
-  @Override
   public String getAriaExpandedState(Element element) {
     return State.EXPANDED.get(element);
   }
 
   @Override
-  public String getAriaFlowtoProperty(Element element) {
-    return Property.FLOWTO.get(element);
-  }
-
-  @Override
-  public String getAriaGrabbedState(Element element) {
-    return State.GRABBED.get(element);
-  }
-
-  @Override
-  public String getAriaHaspopupProperty(Element element) {
-    return Property.HASPOPUP.get(element);
-  }
-
-  @Override
-  public String getAriaHiddenState(Element element) {
-    return State.HIDDEN.get(element);
-  }
-
-  @Override
-  public String getAriaInvalidState(Element element) {
-    return State.INVALID.get(element);
-  }
-
-  @Override
-  public String getAriaLabelledbyProperty(Element element) {
-    return Property.LABELLEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaLabelProperty(Element element) {
-    return Property.LABEL.get(element);
-  }
-
-  @Override
-  public String getAriaLiveProperty(Element element) {
-    return Property.LIVE.get(element);
-  }
-
-  @Override
-  public String getAriaOwnsProperty(Element element) {
-    return Property.OWNS.get(element);
-  }
-
-  @Override
-  public String getAriaRelevantProperty(Element element) {
-    return Property.RELEVANT.get(element);
-  }
-
-  @Override
-  public String getTabindexExtraAttribute(Element element) {
-    return ExtraAttribute.TABINDEX.get(element);
-  }
-
-  @Override
-  public void removeAriaAtomicProperty(Element element) {
-    Property.ATOMIC.remove(element);
-  }
-
-  @Override
-  public void removeAriaBusyState(Element element) {
-    State.BUSY.remove(element);
-  }
-
-  @Override
-  public void removeAriaControlsProperty(Element element) {
-    Property.CONTROLS.remove(element);
-  }
-
-  @Override
-  public void removeAriaDescribedbyProperty(Element element) {
-    Property.DESCRIBEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaDisabledState(Element element) {
-    State.DISABLED.remove(element);
-  }
-
-  @Override
-  public void removeAriaDropeffectProperty(Element element) {
-    Property.DROPEFFECT.remove(element);
-  }
-
-  @Override
   public void removeAriaExpandedState(Element element) {
     State.EXPANDED.remove(element);
   }
 
   @Override
-  public void removeAriaFlowtoProperty(Element element) {
-    Property.FLOWTO.remove(element);
-  }
-
-  @Override
-  public void removeAriaGrabbedState(Element element) {
-    State.GRABBED.remove(element);
-  }
-
-  @Override
-  public void removeAriaHaspopupProperty(Element element) {
-    Property.HASPOPUP.remove(element);
-  }
-
-  @Override
-  public void removeAriaHiddenState(Element element) {
-    State.HIDDEN.remove(element);
-  }
-
-  @Override
-  public void removeAriaInvalidState(Element element) {
-    State.INVALID.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelledbyProperty(Element element) {
-    Property.LABELLEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelProperty(Element element) {
-    Property.LABEL.remove(element);
-  }
-
-  @Override
-  public void removeAriaLiveProperty(Element element) {
-    Property.LIVE.remove(element);
-  }
-
-  @Override
-  public void removeAriaOwnsProperty(Element element) {
-    Property.OWNS.remove(element);
-  }
-
-  @Override
-  public void removeAriaRelevantProperty(Element element) {
-    Property.RELEVANT.remove(element);
-  }
-
-  @Override
-  public void removeTabindexExtraAttribute(Element element) {
-    ExtraAttribute.TABINDEX.remove(element);
-  }
-
-  @Override
-  public void setAriaAtomicProperty(Element element, boolean value) {
-    Property.ATOMIC.set(element, value);
-  }
-
-  @Override
-  public void setAriaBusyState(Element element, boolean value) {
-    State.BUSY.set(element, value);
-  }
-
-  @Override
-  public void setAriaControlsProperty(Element element, IdReference... value) {
-    Property.CONTROLS.set(element, value);
-  }
-
-  @Override
-  public void setAriaDescribedbyProperty(Element element, IdReference... value) {
-    Property.DESCRIBEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaDisabledState(Element element, boolean value) {
-    State.DISABLED.set(element, value);
-  }
-
-  @Override
-  public void setAriaDropeffectProperty(Element element, DropeffectValue... value) {
-    Property.DROPEFFECT.set(element, value);
-  }
-
-  @Override
   public void setAriaExpandedState(Element element, ExpandedValue value) {
     State.EXPANDED.set(element, value);
   }
-
-  @Override
-  public void setAriaFlowtoProperty(Element element, IdReference... value) {
-    Property.FLOWTO.set(element, value);
-  }
-
-  @Override
-  public void setAriaGrabbedState(Element element, GrabbedValue value) {
-    State.GRABBED.set(element, value);
-  }
-
-  @Override
-  public void setAriaHaspopupProperty(Element element, boolean value) {
-    Property.HASPOPUP.set(element, value);
-  }
-
-  @Override
-  public void setAriaHiddenState(Element element, boolean value) {
-    State.HIDDEN.set(element, value);
-  }
-
-  @Override
-  public void setAriaInvalidState(Element element, InvalidValue value) {
-    State.INVALID.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelledbyProperty(Element element, IdReference... value) {
-    Property.LABELLEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelProperty(Element element, String value) {
-    Property.LABEL.set(element, value);
-  }
-
-  @Override
-  public void setAriaLiveProperty(Element element, LiveValue value) {
-    Property.LIVE.set(element, value);
-  }
-
-  @Override
-  public void setAriaOwnsProperty(Element element, IdReference... value) {
-    Property.OWNS.set(element, value);
-  }
-
-  @Override
-  public void setAriaRelevantProperty(Element element, RelevantValue... value) {
-    Property.RELEVANT.set(element, value);
-  }
-
-  @Override
-  public void setTabindexExtraAttribute(Element element, int value) {
-    ExtraAttribute.TABINDEX.set(element, value);
-  }
 }
diff --git a/user/src/com/google/gwt/aria/client/ToolbarRole.java b/user/src/com/google/gwt/aria/client/ToolbarRole.java
index ae2b7cb..4832496 100644
--- a/user/src/com/google/gwt/aria/client/ToolbarRole.java
+++ b/user/src/com/google/gwt/aria/client/ToolbarRole.java
@@ -17,7 +17,6 @@
 // This is auto-generated code.  Do not manually edit! //
 /////////////////////////////////////////////////////////
 
-
 /**
  * A type that represents the <a href="http://www.w3.org/TR/wai-aria/roles#toolbar">toolbar</a>
  * role in the ARIA specification.
diff --git a/user/src/com/google/gwt/aria/client/ToolbarRoleImpl.java b/user/src/com/google/gwt/aria/client/ToolbarRoleImpl.java
index 4592e60..561448f 100644
--- a/user/src/com/google/gwt/aria/client/ToolbarRoleImpl.java
+++ b/user/src/com/google/gwt/aria/client/ToolbarRoleImpl.java
@@ -33,282 +33,27 @@
   }
 
   @Override
-  public String getAriaAtomicProperty(Element element) {
-    return Property.ATOMIC.get(element);
-  }
-
-  @Override
-  public String getAriaBusyState(Element element) {
-    return State.BUSY.get(element);
-  }
-
-  @Override
-  public String getAriaControlsProperty(Element element) {
-    return Property.CONTROLS.get(element);
-  }
-
-  @Override
-  public String getAriaDescribedbyProperty(Element element) {
-    return Property.DESCRIBEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaDisabledState(Element element) {
-    return State.DISABLED.get(element);
-  }
-
-  @Override
-  public String getAriaDropeffectProperty(Element element) {
-    return Property.DROPEFFECT.get(element);
-  }
-
-  @Override
   public String getAriaExpandedState(Element element) {
     return State.EXPANDED.get(element);
   }
 
   @Override
-  public String getAriaFlowtoProperty(Element element) {
-    return Property.FLOWTO.get(element);
-  }
-
-  @Override
-  public String getAriaGrabbedState(Element element) {
-    return State.GRABBED.get(element);
-  }
-
-  @Override
-  public String getAriaHaspopupProperty(Element element) {
-    return Property.HASPOPUP.get(element);
-  }
-
-  @Override
-  public String getAriaHiddenState(Element element) {
-    return State.HIDDEN.get(element);
-  }
-
-  @Override
-  public String getAriaInvalidState(Element element) {
-    return State.INVALID.get(element);
-  }
-
-  @Override
-  public String getAriaLabelledbyProperty(Element element) {
-    return Property.LABELLEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaLabelProperty(Element element) {
-    return Property.LABEL.get(element);
-  }
-
-  @Override
-  public String getAriaLiveProperty(Element element) {
-    return Property.LIVE.get(element);
-  }
-
-  @Override
-  public String getAriaOwnsProperty(Element element) {
-    return Property.OWNS.get(element);
-  }
-
-  @Override
-  public String getAriaRelevantProperty(Element element) {
-    return Property.RELEVANT.get(element);
-  }
-
-  @Override
-  public String getTabindexExtraAttribute(Element element) {
-    return ExtraAttribute.TABINDEX.get(element);
-  }
-
-  @Override
   public void removeAriaActivedescendantProperty(Element element) {
     Property.ACTIVEDESCENDANT.remove(element);
   }
 
   @Override
-  public void removeAriaAtomicProperty(Element element) {
-    Property.ATOMIC.remove(element);
-  }
-
-  @Override
-  public void removeAriaBusyState(Element element) {
-    State.BUSY.remove(element);
-  }
-
-  @Override
-  public void removeAriaControlsProperty(Element element) {
-    Property.CONTROLS.remove(element);
-  }
-
-  @Override
-  public void removeAriaDescribedbyProperty(Element element) {
-    Property.DESCRIBEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaDisabledState(Element element) {
-    State.DISABLED.remove(element);
-  }
-
-  @Override
-  public void removeAriaDropeffectProperty(Element element) {
-    Property.DROPEFFECT.remove(element);
-  }
-
-  @Override
   public void removeAriaExpandedState(Element element) {
     State.EXPANDED.remove(element);
   }
 
   @Override
-  public void removeAriaFlowtoProperty(Element element) {
-    Property.FLOWTO.remove(element);
-  }
-
-  @Override
-  public void removeAriaGrabbedState(Element element) {
-    State.GRABBED.remove(element);
-  }
-
-  @Override
-  public void removeAriaHaspopupProperty(Element element) {
-    Property.HASPOPUP.remove(element);
-  }
-
-  @Override
-  public void removeAriaHiddenState(Element element) {
-    State.HIDDEN.remove(element);
-  }
-
-  @Override
-  public void removeAriaInvalidState(Element element) {
-    State.INVALID.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelledbyProperty(Element element) {
-    Property.LABELLEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelProperty(Element element) {
-    Property.LABEL.remove(element);
-  }
-
-  @Override
-  public void removeAriaLiveProperty(Element element) {
-    Property.LIVE.remove(element);
-  }
-
-  @Override
-  public void removeAriaOwnsProperty(Element element) {
-    Property.OWNS.remove(element);
-  }
-
-  @Override
-  public void removeAriaRelevantProperty(Element element) {
-    Property.RELEVANT.remove(element);
-  }
-
-  @Override
-  public void removeTabindexExtraAttribute(Element element) {
-    ExtraAttribute.TABINDEX.remove(element);
-  }
-
-  @Override
   public void setAriaActivedescendantProperty(Element element, IdReference value) {
     Property.ACTIVEDESCENDANT.set(element, value);
   }
 
   @Override
-  public void setAriaAtomicProperty(Element element, boolean value) {
-    Property.ATOMIC.set(element, value);
-  }
-
-  @Override
-  public void setAriaBusyState(Element element, boolean value) {
-    State.BUSY.set(element, value);
-  }
-
-  @Override
-  public void setAriaControlsProperty(Element element, IdReference... value) {
-    Property.CONTROLS.set(element, value);
-  }
-
-  @Override
-  public void setAriaDescribedbyProperty(Element element, IdReference... value) {
-    Property.DESCRIBEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaDisabledState(Element element, boolean value) {
-    State.DISABLED.set(element, value);
-  }
-
-  @Override
-  public void setAriaDropeffectProperty(Element element, DropeffectValue... value) {
-    Property.DROPEFFECT.set(element, value);
-  }
-
-  @Override
   public void setAriaExpandedState(Element element, ExpandedValue value) {
     State.EXPANDED.set(element, value);
   }
-
-  @Override
-  public void setAriaFlowtoProperty(Element element, IdReference... value) {
-    Property.FLOWTO.set(element, value);
-  }
-
-  @Override
-  public void setAriaGrabbedState(Element element, GrabbedValue value) {
-    State.GRABBED.set(element, value);
-  }
-
-  @Override
-  public void setAriaHaspopupProperty(Element element, boolean value) {
-    Property.HASPOPUP.set(element, value);
-  }
-
-  @Override
-  public void setAriaHiddenState(Element element, boolean value) {
-    State.HIDDEN.set(element, value);
-  }
-
-  @Override
-  public void setAriaInvalidState(Element element, InvalidValue value) {
-    State.INVALID.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelledbyProperty(Element element, IdReference... value) {
-    Property.LABELLEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelProperty(Element element, String value) {
-    Property.LABEL.set(element, value);
-  }
-
-  @Override
-  public void setAriaLiveProperty(Element element, LiveValue value) {
-    Property.LIVE.set(element, value);
-  }
-
-  @Override
-  public void setAriaOwnsProperty(Element element, IdReference... value) {
-    Property.OWNS.set(element, value);
-  }
-
-  @Override
-  public void setAriaRelevantProperty(Element element, RelevantValue... value) {
-    Property.RELEVANT.set(element, value);
-  }
-
-  @Override
-  public void setTabindexExtraAttribute(Element element, int value) {
-    ExtraAttribute.TABINDEX.set(element, value);
-  }
 }
diff --git a/user/src/com/google/gwt/aria/client/TooltipRole.java b/user/src/com/google/gwt/aria/client/TooltipRole.java
index b456cc7..38d33af 100644
--- a/user/src/com/google/gwt/aria/client/TooltipRole.java
+++ b/user/src/com/google/gwt/aria/client/TooltipRole.java
@@ -17,7 +17,6 @@
 // This is auto-generated code.  Do not manually edit! //
 /////////////////////////////////////////////////////////
 
-
 /**
  * A type that represents the <a href="http://www.w3.org/TR/wai-aria/roles#tooltip">tooltip</a>
  * role in the ARIA specification.
diff --git a/user/src/com/google/gwt/aria/client/TooltipRoleImpl.java b/user/src/com/google/gwt/aria/client/TooltipRoleImpl.java
index 309a1ca..576d3bc 100644
--- a/user/src/com/google/gwt/aria/client/TooltipRoleImpl.java
+++ b/user/src/com/google/gwt/aria/client/TooltipRoleImpl.java
@@ -28,272 +28,17 @@
   }
 
   @Override
-  public String getAriaAtomicProperty(Element element) {
-    return Property.ATOMIC.get(element);
-  }
-
-  @Override
-  public String getAriaBusyState(Element element) {
-    return State.BUSY.get(element);
-  }
-
-  @Override
-  public String getAriaControlsProperty(Element element) {
-    return Property.CONTROLS.get(element);
-  }
-
-  @Override
-  public String getAriaDescribedbyProperty(Element element) {
-    return Property.DESCRIBEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaDisabledState(Element element) {
-    return State.DISABLED.get(element);
-  }
-
-  @Override
-  public String getAriaDropeffectProperty(Element element) {
-    return Property.DROPEFFECT.get(element);
-  }
-
-  @Override
   public String getAriaExpandedState(Element element) {
     return State.EXPANDED.get(element);
   }
 
   @Override
-  public String getAriaFlowtoProperty(Element element) {
-    return Property.FLOWTO.get(element);
-  }
-
-  @Override
-  public String getAriaGrabbedState(Element element) {
-    return State.GRABBED.get(element);
-  }
-
-  @Override
-  public String getAriaHaspopupProperty(Element element) {
-    return Property.HASPOPUP.get(element);
-  }
-
-  @Override
-  public String getAriaHiddenState(Element element) {
-    return State.HIDDEN.get(element);
-  }
-
-  @Override
-  public String getAriaInvalidState(Element element) {
-    return State.INVALID.get(element);
-  }
-
-  @Override
-  public String getAriaLabelledbyProperty(Element element) {
-    return Property.LABELLEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaLabelProperty(Element element) {
-    return Property.LABEL.get(element);
-  }
-
-  @Override
-  public String getAriaLiveProperty(Element element) {
-    return Property.LIVE.get(element);
-  }
-
-  @Override
-  public String getAriaOwnsProperty(Element element) {
-    return Property.OWNS.get(element);
-  }
-
-  @Override
-  public String getAriaRelevantProperty(Element element) {
-    return Property.RELEVANT.get(element);
-  }
-
-  @Override
-  public String getTabindexExtraAttribute(Element element) {
-    return ExtraAttribute.TABINDEX.get(element);
-  }
-
-  @Override
-  public void removeAriaAtomicProperty(Element element) {
-    Property.ATOMIC.remove(element);
-  }
-
-  @Override
-  public void removeAriaBusyState(Element element) {
-    State.BUSY.remove(element);
-  }
-
-  @Override
-  public void removeAriaControlsProperty(Element element) {
-    Property.CONTROLS.remove(element);
-  }
-
-  @Override
-  public void removeAriaDescribedbyProperty(Element element) {
-    Property.DESCRIBEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaDisabledState(Element element) {
-    State.DISABLED.remove(element);
-  }
-
-  @Override
-  public void removeAriaDropeffectProperty(Element element) {
-    Property.DROPEFFECT.remove(element);
-  }
-
-  @Override
   public void removeAriaExpandedState(Element element) {
     State.EXPANDED.remove(element);
   }
 
   @Override
-  public void removeAriaFlowtoProperty(Element element) {
-    Property.FLOWTO.remove(element);
-  }
-
-  @Override
-  public void removeAriaGrabbedState(Element element) {
-    State.GRABBED.remove(element);
-  }
-
-  @Override
-  public void removeAriaHaspopupProperty(Element element) {
-    Property.HASPOPUP.remove(element);
-  }
-
-  @Override
-  public void removeAriaHiddenState(Element element) {
-    State.HIDDEN.remove(element);
-  }
-
-  @Override
-  public void removeAriaInvalidState(Element element) {
-    State.INVALID.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelledbyProperty(Element element) {
-    Property.LABELLEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelProperty(Element element) {
-    Property.LABEL.remove(element);
-  }
-
-  @Override
-  public void removeAriaLiveProperty(Element element) {
-    Property.LIVE.remove(element);
-  }
-
-  @Override
-  public void removeAriaOwnsProperty(Element element) {
-    Property.OWNS.remove(element);
-  }
-
-  @Override
-  public void removeAriaRelevantProperty(Element element) {
-    Property.RELEVANT.remove(element);
-  }
-
-  @Override
-  public void removeTabindexExtraAttribute(Element element) {
-    ExtraAttribute.TABINDEX.remove(element);
-  }
-
-  @Override
-  public void setAriaAtomicProperty(Element element, boolean value) {
-    Property.ATOMIC.set(element, value);
-  }
-
-  @Override
-  public void setAriaBusyState(Element element, boolean value) {
-    State.BUSY.set(element, value);
-  }
-
-  @Override
-  public void setAriaControlsProperty(Element element, IdReference... value) {
-    Property.CONTROLS.set(element, value);
-  }
-
-  @Override
-  public void setAriaDescribedbyProperty(Element element, IdReference... value) {
-    Property.DESCRIBEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaDisabledState(Element element, boolean value) {
-    State.DISABLED.set(element, value);
-  }
-
-  @Override
-  public void setAriaDropeffectProperty(Element element, DropeffectValue... value) {
-    Property.DROPEFFECT.set(element, value);
-  }
-
-  @Override
   public void setAriaExpandedState(Element element, ExpandedValue value) {
     State.EXPANDED.set(element, value);
   }
-
-  @Override
-  public void setAriaFlowtoProperty(Element element, IdReference... value) {
-    Property.FLOWTO.set(element, value);
-  }
-
-  @Override
-  public void setAriaGrabbedState(Element element, GrabbedValue value) {
-    State.GRABBED.set(element, value);
-  }
-
-  @Override
-  public void setAriaHaspopupProperty(Element element, boolean value) {
-    Property.HASPOPUP.set(element, value);
-  }
-
-  @Override
-  public void setAriaHiddenState(Element element, boolean value) {
-    State.HIDDEN.set(element, value);
-  }
-
-  @Override
-  public void setAriaInvalidState(Element element, InvalidValue value) {
-    State.INVALID.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelledbyProperty(Element element, IdReference... value) {
-    Property.LABELLEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelProperty(Element element, String value) {
-    Property.LABEL.set(element, value);
-  }
-
-  @Override
-  public void setAriaLiveProperty(Element element, LiveValue value) {
-    Property.LIVE.set(element, value);
-  }
-
-  @Override
-  public void setAriaOwnsProperty(Element element, IdReference... value) {
-    Property.OWNS.set(element, value);
-  }
-
-  @Override
-  public void setAriaRelevantProperty(Element element, RelevantValue... value) {
-    Property.RELEVANT.set(element, value);
-  }
-
-  @Override
-  public void setTabindexExtraAttribute(Element element, int value) {
-    ExtraAttribute.TABINDEX.set(element, value);
-  }
 }
diff --git a/user/src/com/google/gwt/aria/client/TreeRoleImpl.java b/user/src/com/google/gwt/aria/client/TreeRoleImpl.java
index 6927782..b22c5b8 100644
--- a/user/src/com/google/gwt/aria/client/TreeRoleImpl.java
+++ b/user/src/com/google/gwt/aria/client/TreeRoleImpl.java
@@ -33,312 +33,57 @@
   }
 
   @Override
-  public String getAriaAtomicProperty(Element element) {
-    return Property.ATOMIC.get(element);
-  }
-
-  @Override
-  public String getAriaBusyState(Element element) {
-    return State.BUSY.get(element);
-  }
-
-  @Override
-  public String getAriaControlsProperty(Element element) {
-    return Property.CONTROLS.get(element);
-  }
-
-  @Override
-  public String getAriaDescribedbyProperty(Element element) {
-    return Property.DESCRIBEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaDisabledState(Element element) {
-    return State.DISABLED.get(element);
-  }
-
-  @Override
-  public String getAriaDropeffectProperty(Element element) {
-    return Property.DROPEFFECT.get(element);
-  }
-
-  @Override
   public String getAriaExpandedState(Element element) {
     return State.EXPANDED.get(element);
   }
 
   @Override
-  public String getAriaFlowtoProperty(Element element) {
-    return Property.FLOWTO.get(element);
-  }
-
-  @Override
-  public String getAriaGrabbedState(Element element) {
-    return State.GRABBED.get(element);
-  }
-
-  @Override
-  public String getAriaHaspopupProperty(Element element) {
-    return Property.HASPOPUP.get(element);
-  }
-
-  @Override
-  public String getAriaHiddenState(Element element) {
-    return State.HIDDEN.get(element);
-  }
-
-  @Override
-  public String getAriaInvalidState(Element element) {
-    return State.INVALID.get(element);
-  }
-
-  @Override
-  public String getAriaLabelledbyProperty(Element element) {
-    return Property.LABELLEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaLabelProperty(Element element) {
-    return Property.LABEL.get(element);
-  }
-
-  @Override
-  public String getAriaLiveProperty(Element element) {
-    return Property.LIVE.get(element);
-  }
-
-  @Override
   public String getAriaMultiselectableProperty(Element element) {
     return Property.MULTISELECTABLE.get(element);
   }
 
   @Override
-  public String getAriaOwnsProperty(Element element) {
-    return Property.OWNS.get(element);
-  }
-
-  @Override
-  public String getAriaRelevantProperty(Element element) {
-    return Property.RELEVANT.get(element);
-  }
-
-  @Override
   public String getAriaRequiredProperty(Element element) {
     return Property.REQUIRED.get(element);
   }
 
   @Override
-  public String getTabindexExtraAttribute(Element element) {
-    return ExtraAttribute.TABINDEX.get(element);
-  }
-
-  @Override
   public void removeAriaActivedescendantProperty(Element element) {
     Property.ACTIVEDESCENDANT.remove(element);
   }
 
   @Override
-  public void removeAriaAtomicProperty(Element element) {
-    Property.ATOMIC.remove(element);
-  }
-
-  @Override
-  public void removeAriaBusyState(Element element) {
-    State.BUSY.remove(element);
-  }
-
-  @Override
-  public void removeAriaControlsProperty(Element element) {
-    Property.CONTROLS.remove(element);
-  }
-
-  @Override
-  public void removeAriaDescribedbyProperty(Element element) {
-    Property.DESCRIBEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaDisabledState(Element element) {
-    State.DISABLED.remove(element);
-  }
-
-  @Override
-  public void removeAriaDropeffectProperty(Element element) {
-    Property.DROPEFFECT.remove(element);
-  }
-
-  @Override
   public void removeAriaExpandedState(Element element) {
     State.EXPANDED.remove(element);
   }
 
   @Override
-  public void removeAriaFlowtoProperty(Element element) {
-    Property.FLOWTO.remove(element);
-  }
-
-  @Override
-  public void removeAriaGrabbedState(Element element) {
-    State.GRABBED.remove(element);
-  }
-
-  @Override
-  public void removeAriaHaspopupProperty(Element element) {
-    Property.HASPOPUP.remove(element);
-  }
-
-  @Override
-  public void removeAriaHiddenState(Element element) {
-    State.HIDDEN.remove(element);
-  }
-
-  @Override
-  public void removeAriaInvalidState(Element element) {
-    State.INVALID.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelledbyProperty(Element element) {
-    Property.LABELLEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelProperty(Element element) {
-    Property.LABEL.remove(element);
-  }
-
-  @Override
-  public void removeAriaLiveProperty(Element element) {
-    Property.LIVE.remove(element);
-  }
-
-  @Override
   public void removeAriaMultiselectableProperty(Element element) {
     Property.MULTISELECTABLE.remove(element);
   }
 
   @Override
-  public void removeAriaOwnsProperty(Element element) {
-    Property.OWNS.remove(element);
-  }
-
-  @Override
-  public void removeAriaRelevantProperty(Element element) {
-    Property.RELEVANT.remove(element);
-  }
-
-  @Override
   public void removeAriaRequiredProperty(Element element) {
     Property.REQUIRED.remove(element);
   }
 
   @Override
-  public void removeTabindexExtraAttribute(Element element) {
-    ExtraAttribute.TABINDEX.remove(element);
-  }
-
-  @Override
   public void setAriaActivedescendantProperty(Element element, IdReference value) {
     Property.ACTIVEDESCENDANT.set(element, value);
   }
 
   @Override
-  public void setAriaAtomicProperty(Element element, boolean value) {
-    Property.ATOMIC.set(element, value);
-  }
-
-  @Override
-  public void setAriaBusyState(Element element, boolean value) {
-    State.BUSY.set(element, value);
-  }
-
-  @Override
-  public void setAriaControlsProperty(Element element, IdReference... value) {
-    Property.CONTROLS.set(element, value);
-  }
-
-  @Override
-  public void setAriaDescribedbyProperty(Element element, IdReference... value) {
-    Property.DESCRIBEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaDisabledState(Element element, boolean value) {
-    State.DISABLED.set(element, value);
-  }
-
-  @Override
-  public void setAriaDropeffectProperty(Element element, DropeffectValue... value) {
-    Property.DROPEFFECT.set(element, value);
-  }
-
-  @Override
   public void setAriaExpandedState(Element element, ExpandedValue value) {
     State.EXPANDED.set(element, value);
   }
 
   @Override
-  public void setAriaFlowtoProperty(Element element, IdReference... value) {
-    Property.FLOWTO.set(element, value);
-  }
-
-  @Override
-  public void setAriaGrabbedState(Element element, GrabbedValue value) {
-    State.GRABBED.set(element, value);
-  }
-
-  @Override
-  public void setAriaHaspopupProperty(Element element, boolean value) {
-    Property.HASPOPUP.set(element, value);
-  }
-
-  @Override
-  public void setAriaHiddenState(Element element, boolean value) {
-    State.HIDDEN.set(element, value);
-  }
-
-  @Override
-  public void setAriaInvalidState(Element element, InvalidValue value) {
-    State.INVALID.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelledbyProperty(Element element, IdReference... value) {
-    Property.LABELLEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelProperty(Element element, String value) {
-    Property.LABEL.set(element, value);
-  }
-
-  @Override
-  public void setAriaLiveProperty(Element element, LiveValue value) {
-    Property.LIVE.set(element, value);
-  }
-
-  @Override
   public void setAriaMultiselectableProperty(Element element, boolean value) {
     Property.MULTISELECTABLE.set(element, value);
   }
 
   @Override
-  public void setAriaOwnsProperty(Element element, IdReference... value) {
-    Property.OWNS.set(element, value);
-  }
-
-  @Override
-  public void setAriaRelevantProperty(Element element, RelevantValue... value) {
-    Property.RELEVANT.set(element, value);
-  }
-
-  @Override
   public void setAriaRequiredProperty(Element element, boolean value) {
     Property.REQUIRED.set(element, value);
   }
-
-  @Override
-  public void setTabindexExtraAttribute(Element element, int value) {
-    ExtraAttribute.TABINDEX.set(element, value);
-  }
 }
diff --git a/user/src/com/google/gwt/aria/client/TreegridRole.java b/user/src/com/google/gwt/aria/client/TreegridRole.java
index e2a4430..53308fe 100644
--- a/user/src/com/google/gwt/aria/client/TreegridRole.java
+++ b/user/src/com/google/gwt/aria/client/TreegridRole.java
@@ -17,7 +17,6 @@
 // This is auto-generated code.  Do not manually edit! //
 /////////////////////////////////////////////////////////
 
-
 /**
  * A type that represents the <a href="http://www.w3.org/TR/wai-aria/roles#treegrid">treegrid</a>
  * role in the ARIA specification.
diff --git a/user/src/com/google/gwt/aria/client/TreegridRoleImpl.java b/user/src/com/google/gwt/aria/client/TreegridRoleImpl.java
index 1d5f9bf..0bee03c 100644
--- a/user/src/com/google/gwt/aria/client/TreegridRoleImpl.java
+++ b/user/src/com/google/gwt/aria/client/TreegridRoleImpl.java
@@ -33,342 +33,87 @@
   }
 
   @Override
-  public String getAriaAtomicProperty(Element element) {
-    return Property.ATOMIC.get(element);
-  }
-
-  @Override
-  public String getAriaBusyState(Element element) {
-    return State.BUSY.get(element);
-  }
-
-  @Override
-  public String getAriaControlsProperty(Element element) {
-    return Property.CONTROLS.get(element);
-  }
-
-  @Override
-  public String getAriaDescribedbyProperty(Element element) {
-    return Property.DESCRIBEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaDisabledState(Element element) {
-    return State.DISABLED.get(element);
-  }
-
-  @Override
-  public String getAriaDropeffectProperty(Element element) {
-    return Property.DROPEFFECT.get(element);
-  }
-
-  @Override
   public String getAriaExpandedState(Element element) {
     return State.EXPANDED.get(element);
   }
 
   @Override
-  public String getAriaFlowtoProperty(Element element) {
-    return Property.FLOWTO.get(element);
-  }
-
-  @Override
-  public String getAriaGrabbedState(Element element) {
-    return State.GRABBED.get(element);
-  }
-
-  @Override
-  public String getAriaHaspopupProperty(Element element) {
-    return Property.HASPOPUP.get(element);
-  }
-
-  @Override
-  public String getAriaHiddenState(Element element) {
-    return State.HIDDEN.get(element);
-  }
-
-  @Override
-  public String getAriaInvalidState(Element element) {
-    return State.INVALID.get(element);
-  }
-
-  @Override
-  public String getAriaLabelledbyProperty(Element element) {
-    return Property.LABELLEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaLabelProperty(Element element) {
-    return Property.LABEL.get(element);
-  }
-
-  @Override
   public String getAriaLevelProperty(Element element) {
     return Property.LEVEL.get(element);
   }
 
   @Override
-  public String getAriaLiveProperty(Element element) {
-    return Property.LIVE.get(element);
-  }
-
-  @Override
   public String getAriaMultiselectableProperty(Element element) {
     return Property.MULTISELECTABLE.get(element);
   }
 
   @Override
-  public String getAriaOwnsProperty(Element element) {
-    return Property.OWNS.get(element);
-  }
-
-  @Override
   public String getAriaReadonlyProperty(Element element) {
     return Property.READONLY.get(element);
   }
 
   @Override
-  public String getAriaRelevantProperty(Element element) {
-    return Property.RELEVANT.get(element);
-  }
-
-  @Override
   public String getAriaRequiredProperty(Element element) {
     return Property.REQUIRED.get(element);
   }
 
   @Override
-  public String getTabindexExtraAttribute(Element element) {
-    return ExtraAttribute.TABINDEX.get(element);
-  }
-
-  @Override
   public void removeAriaActivedescendantProperty(Element element) {
     Property.ACTIVEDESCENDANT.remove(element);
   }
 
   @Override
-  public void removeAriaAtomicProperty(Element element) {
-    Property.ATOMIC.remove(element);
-  }
-
-  @Override
-  public void removeAriaBusyState(Element element) {
-    State.BUSY.remove(element);
-  }
-
-  @Override
-  public void removeAriaControlsProperty(Element element) {
-    Property.CONTROLS.remove(element);
-  }
-
-  @Override
-  public void removeAriaDescribedbyProperty(Element element) {
-    Property.DESCRIBEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaDisabledState(Element element) {
-    State.DISABLED.remove(element);
-  }
-
-  @Override
-  public void removeAriaDropeffectProperty(Element element) {
-    Property.DROPEFFECT.remove(element);
-  }
-
-  @Override
   public void removeAriaExpandedState(Element element) {
     State.EXPANDED.remove(element);
   }
 
   @Override
-  public void removeAriaFlowtoProperty(Element element) {
-    Property.FLOWTO.remove(element);
-  }
-
-  @Override
-  public void removeAriaGrabbedState(Element element) {
-    State.GRABBED.remove(element);
-  }
-
-  @Override
-  public void removeAriaHaspopupProperty(Element element) {
-    Property.HASPOPUP.remove(element);
-  }
-
-  @Override
-  public void removeAriaHiddenState(Element element) {
-    State.HIDDEN.remove(element);
-  }
-
-  @Override
-  public void removeAriaInvalidState(Element element) {
-    State.INVALID.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelledbyProperty(Element element) {
-    Property.LABELLEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelProperty(Element element) {
-    Property.LABEL.remove(element);
-  }
-
-  @Override
   public void removeAriaLevelProperty(Element element) {
     Property.LEVEL.remove(element);
   }
 
   @Override
-  public void removeAriaLiveProperty(Element element) {
-    Property.LIVE.remove(element);
-  }
-
-  @Override
   public void removeAriaMultiselectableProperty(Element element) {
     Property.MULTISELECTABLE.remove(element);
   }
 
   @Override
-  public void removeAriaOwnsProperty(Element element) {
-    Property.OWNS.remove(element);
-  }
-
-  @Override
   public void removeAriaReadonlyProperty(Element element) {
     Property.READONLY.remove(element);
   }
 
   @Override
-  public void removeAriaRelevantProperty(Element element) {
-    Property.RELEVANT.remove(element);
-  }
-
-  @Override
   public void removeAriaRequiredProperty(Element element) {
     Property.REQUIRED.remove(element);
   }
 
   @Override
-  public void removeTabindexExtraAttribute(Element element) {
-    ExtraAttribute.TABINDEX.remove(element);
-  }
-
-  @Override
   public void setAriaActivedescendantProperty(Element element, IdReference value) {
     Property.ACTIVEDESCENDANT.set(element, value);
   }
 
   @Override
-  public void setAriaAtomicProperty(Element element, boolean value) {
-    Property.ATOMIC.set(element, value);
-  }
-
-  @Override
-  public void setAriaBusyState(Element element, boolean value) {
-    State.BUSY.set(element, value);
-  }
-
-  @Override
-  public void setAriaControlsProperty(Element element, IdReference... value) {
-    Property.CONTROLS.set(element, value);
-  }
-
-  @Override
-  public void setAriaDescribedbyProperty(Element element, IdReference... value) {
-    Property.DESCRIBEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaDisabledState(Element element, boolean value) {
-    State.DISABLED.set(element, value);
-  }
-
-  @Override
-  public void setAriaDropeffectProperty(Element element, DropeffectValue... value) {
-    Property.DROPEFFECT.set(element, value);
-  }
-
-  @Override
   public void setAriaExpandedState(Element element, ExpandedValue value) {
     State.EXPANDED.set(element, value);
   }
 
   @Override
-  public void setAriaFlowtoProperty(Element element, IdReference... value) {
-    Property.FLOWTO.set(element, value);
-  }
-
-  @Override
-  public void setAriaGrabbedState(Element element, GrabbedValue value) {
-    State.GRABBED.set(element, value);
-  }
-
-  @Override
-  public void setAriaHaspopupProperty(Element element, boolean value) {
-    Property.HASPOPUP.set(element, value);
-  }
-
-  @Override
-  public void setAriaHiddenState(Element element, boolean value) {
-    State.HIDDEN.set(element, value);
-  }
-
-  @Override
-  public void setAriaInvalidState(Element element, InvalidValue value) {
-    State.INVALID.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelledbyProperty(Element element, IdReference... value) {
-    Property.LABELLEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelProperty(Element element, String value) {
-    Property.LABEL.set(element, value);
-  }
-
-  @Override
   public void setAriaLevelProperty(Element element, int value) {
     Property.LEVEL.set(element, value);
   }
 
   @Override
-  public void setAriaLiveProperty(Element element, LiveValue value) {
-    Property.LIVE.set(element, value);
-  }
-
-  @Override
   public void setAriaMultiselectableProperty(Element element, boolean value) {
     Property.MULTISELECTABLE.set(element, value);
   }
 
   @Override
-  public void setAriaOwnsProperty(Element element, IdReference... value) {
-    Property.OWNS.set(element, value);
-  }
-
-  @Override
   public void setAriaReadonlyProperty(Element element, boolean value) {
     Property.READONLY.set(element, value);
   }
 
   @Override
-  public void setAriaRelevantProperty(Element element, RelevantValue... value) {
-    Property.RELEVANT.set(element, value);
-  }
-
-  @Override
   public void setAriaRequiredProperty(Element element, boolean value) {
     Property.REQUIRED.set(element, value);
   }
-
-  @Override
-  public void setTabindexExtraAttribute(Element element, int value) {
-    ExtraAttribute.TABINDEX.set(element, value);
-  }
 }
diff --git a/user/src/com/google/gwt/aria/client/TreeitemRole.java b/user/src/com/google/gwt/aria/client/TreeitemRole.java
index 2266786..c4480f5 100644
--- a/user/src/com/google/gwt/aria/client/TreeitemRole.java
+++ b/user/src/com/google/gwt/aria/client/TreeitemRole.java
@@ -17,7 +17,6 @@
 // This is auto-generated code.  Do not manually edit! //
 /////////////////////////////////////////////////////////
 
-
 /**
  * A type that represents the <a href="http://www.w3.org/TR/wai-aria/roles#treeitem">treeitem</a>
  * role in the ARIA specification.
diff --git a/user/src/com/google/gwt/aria/client/TreeitemRoleImpl.java b/user/src/com/google/gwt/aria/client/TreeitemRoleImpl.java
index 7344626..79edeb3 100644
--- a/user/src/com/google/gwt/aria/client/TreeitemRoleImpl.java
+++ b/user/src/com/google/gwt/aria/client/TreeitemRoleImpl.java
@@ -28,106 +28,26 @@
   }
 
   @Override
-  public String getAriaAtomicProperty(Element element) {
-    return Property.ATOMIC.get(element);
-  }
-
-  @Override
-  public String getAriaBusyState(Element element) {
-    return State.BUSY.get(element);
-  }
-
-  @Override
   public String getAriaCheckedState(Element element) {
     return State.CHECKED.get(element);
   }
 
   @Override
-  public String getAriaControlsProperty(Element element) {
-    return Property.CONTROLS.get(element);
-  }
-
-  @Override
-  public String getAriaDescribedbyProperty(Element element) {
-    return Property.DESCRIBEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaDisabledState(Element element) {
-    return State.DISABLED.get(element);
-  }
-
-  @Override
-  public String getAriaDropeffectProperty(Element element) {
-    return Property.DROPEFFECT.get(element);
-  }
-
-  @Override
   public String getAriaExpandedState(Element element) {
     return State.EXPANDED.get(element);
   }
 
   @Override
-  public String getAriaFlowtoProperty(Element element) {
-    return Property.FLOWTO.get(element);
-  }
-
-  @Override
-  public String getAriaGrabbedState(Element element) {
-    return State.GRABBED.get(element);
-  }
-
-  @Override
-  public String getAriaHaspopupProperty(Element element) {
-    return Property.HASPOPUP.get(element);
-  }
-
-  @Override
-  public String getAriaHiddenState(Element element) {
-    return State.HIDDEN.get(element);
-  }
-
-  @Override
-  public String getAriaInvalidState(Element element) {
-    return State.INVALID.get(element);
-  }
-
-  @Override
-  public String getAriaLabelledbyProperty(Element element) {
-    return Property.LABELLEDBY.get(element);
-  }
-
-  @Override
-  public String getAriaLabelProperty(Element element) {
-    return Property.LABEL.get(element);
-  }
-
-  @Override
   public String getAriaLevelProperty(Element element) {
     return Property.LEVEL.get(element);
   }
 
   @Override
-  public String getAriaLiveProperty(Element element) {
-    return Property.LIVE.get(element);
-  }
-
-  @Override
-  public String getAriaOwnsProperty(Element element) {
-    return Property.OWNS.get(element);
-  }
-
-  @Override
   public String getAriaPosinsetProperty(Element element) {
     return Property.POSINSET.get(element);
   }
 
   @Override
-  public String getAriaRelevantProperty(Element element) {
-    return Property.RELEVANT.get(element);
-  }
-
-  @Override
   public String getAriaSelectedState(Element element) {
     return State.SELECTED.get(element);
   }
@@ -138,111 +58,26 @@
   }
 
   @Override
-  public String getTabindexExtraAttribute(Element element) {
-    return ExtraAttribute.TABINDEX.get(element);
-  }
-
-  @Override
-  public void removeAriaAtomicProperty(Element element) {
-    Property.ATOMIC.remove(element);
-  }
-
-  @Override
-  public void removeAriaBusyState(Element element) {
-    State.BUSY.remove(element);
-  }
-
-  @Override
   public void removeAriaCheckedState(Element element) {
     State.CHECKED.remove(element);
   }
 
   @Override
-  public void removeAriaControlsProperty(Element element) {
-    Property.CONTROLS.remove(element);
-  }
-
-  @Override
-  public void removeAriaDescribedbyProperty(Element element) {
-    Property.DESCRIBEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaDisabledState(Element element) {
-    State.DISABLED.remove(element);
-  }
-
-  @Override
-  public void removeAriaDropeffectProperty(Element element) {
-    Property.DROPEFFECT.remove(element);
-  }
-
-  @Override
   public void removeAriaExpandedState(Element element) {
     State.EXPANDED.remove(element);
   }
 
   @Override
-  public void removeAriaFlowtoProperty(Element element) {
-    Property.FLOWTO.remove(element);
-  }
-
-  @Override
-  public void removeAriaGrabbedState(Element element) {
-    State.GRABBED.remove(element);
-  }
-
-  @Override
-  public void removeAriaHaspopupProperty(Element element) {
-    Property.HASPOPUP.remove(element);
-  }
-
-  @Override
-  public void removeAriaHiddenState(Element element) {
-    State.HIDDEN.remove(element);
-  }
-
-  @Override
-  public void removeAriaInvalidState(Element element) {
-    State.INVALID.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelledbyProperty(Element element) {
-    Property.LABELLEDBY.remove(element);
-  }
-
-  @Override
-  public void removeAriaLabelProperty(Element element) {
-    Property.LABEL.remove(element);
-  }
-
-  @Override
   public void removeAriaLevelProperty(Element element) {
     Property.LEVEL.remove(element);
   }
 
   @Override
-  public void removeAriaLiveProperty(Element element) {
-    Property.LIVE.remove(element);
-  }
-
-  @Override
-  public void removeAriaOwnsProperty(Element element) {
-    Property.OWNS.remove(element);
-  }
-
-  @Override
   public void removeAriaPosinsetProperty(Element element) {
     Property.POSINSET.remove(element);
   }
 
   @Override
-  public void removeAriaRelevantProperty(Element element) {
-    Property.RELEVANT.remove(element);
-  }
-
-  @Override
   public void removeAriaSelectedState(Element element) {
     State.SELECTED.remove(element);
   }
@@ -253,111 +88,26 @@
   }
 
   @Override
-  public void removeTabindexExtraAttribute(Element element) {
-    ExtraAttribute.TABINDEX.remove(element);
-  }
-
-  @Override
-  public void setAriaAtomicProperty(Element element, boolean value) {
-    Property.ATOMIC.set(element, value);
-  }
-
-  @Override
-  public void setAriaBusyState(Element element, boolean value) {
-    State.BUSY.set(element, value);
-  }
-
-  @Override
   public void setAriaCheckedState(Element element, CheckedValue value) {
     State.CHECKED.set(element, value);
   }
 
   @Override
-  public void setAriaControlsProperty(Element element, IdReference... value) {
-    Property.CONTROLS.set(element, value);
-  }
-
-  @Override
-  public void setAriaDescribedbyProperty(Element element, IdReference... value) {
-    Property.DESCRIBEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaDisabledState(Element element, boolean value) {
-    State.DISABLED.set(element, value);
-  }
-
-  @Override
-  public void setAriaDropeffectProperty(Element element, DropeffectValue... value) {
-    Property.DROPEFFECT.set(element, value);
-  }
-
-  @Override
   public void setAriaExpandedState(Element element, ExpandedValue value) {
     State.EXPANDED.set(element, value);
   }
 
   @Override
-  public void setAriaFlowtoProperty(Element element, IdReference... value) {
-    Property.FLOWTO.set(element, value);
-  }
-
-  @Override
-  public void setAriaGrabbedState(Element element, GrabbedValue value) {
-    State.GRABBED.set(element, value);
-  }
-
-  @Override
-  public void setAriaHaspopupProperty(Element element, boolean value) {
-    Property.HASPOPUP.set(element, value);
-  }
-
-  @Override
-  public void setAriaHiddenState(Element element, boolean value) {
-    State.HIDDEN.set(element, value);
-  }
-
-  @Override
-  public void setAriaInvalidState(Element element, InvalidValue value) {
-    State.INVALID.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelledbyProperty(Element element, IdReference... value) {
-    Property.LABELLEDBY.set(element, value);
-  }
-
-  @Override
-  public void setAriaLabelProperty(Element element, String value) {
-    Property.LABEL.set(element, value);
-  }
-
-  @Override
   public void setAriaLevelProperty(Element element, int value) {
     Property.LEVEL.set(element, value);
   }
 
   @Override
-  public void setAriaLiveProperty(Element element, LiveValue value) {
-    Property.LIVE.set(element, value);
-  }
-
-  @Override
-  public void setAriaOwnsProperty(Element element, IdReference... value) {
-    Property.OWNS.set(element, value);
-  }
-
-  @Override
   public void setAriaPosinsetProperty(Element element, int value) {
     Property.POSINSET.set(element, value);
   }
 
   @Override
-  public void setAriaRelevantProperty(Element element, RelevantValue... value) {
-    Property.RELEVANT.set(element, value);
-  }
-
-  @Override
   public void setAriaSelectedState(Element element, SelectedValue value) {
     State.SELECTED.set(element, value);
   }
@@ -366,9 +116,4 @@
   public void setAriaSetsizeProperty(Element element, int value) {
     Property.SETSIZE.set(element, value);
   }
-
-  @Override
-  public void setTabindexExtraAttribute(Element element, int value) {
-    ExtraAttribute.TABINDEX.set(element, value);
-  }
 }
diff --git a/user/src/com/google/gwt/aria/client/WidgetRole.java b/user/src/com/google/gwt/aria/client/WidgetRole.java
index 7b7f38e..f12ec33 100644
--- a/user/src/com/google/gwt/aria/client/WidgetRole.java
+++ b/user/src/com/google/gwt/aria/client/WidgetRole.java
@@ -17,7 +17,6 @@
 // This is auto-generated code.  Do not manually edit! //
 /////////////////////////////////////////////////////////
 
-
 /**
  * A type that represents the <a href="http://www.w3.org/TR/wai-aria/roles#widget">widget</a>
  * role in the ARIA specification.