Cleanups
Try to fix the JaxWS IT bug