CDI-358, remove old language