clean up part 1