iteration 6 - cleanup