some cleanup and restore to use jaxws property rather than feature