Problem 1 clean up