toolkit clean up