clean up the JAXB stuff