Tasklist cleanup (maybe not final)