CDI-334 clean up language