#51 removed all occurences of CDO from .java files