Deleted TODO and durendal.