Removed some JAXB annotation noise from some generated classes, subsequently modified.  We don't need the annotations anymore.