more clean up for CXF 3.0.2 upgrade