remove dto
several changes