task side clean up
more clean up