Do you plan to port some of this cleanup to task template?