more task cleanup