Resolving TODOs in CoreDpus descriptions