remove some old variables and slightly tidy the TASKs