[CXF-5118] Cleaning