Extended template clean up task to new fields.