Finish removing DtoX