Remove unnecessary sub-task scope