More cleaning of optinal subtasks.