task cleanup should work better now.