Ensure top level tasks are also cleaned