more clean up work