more cleanup after upgrade to CXF 3.0.2