Fix Part 2, cleanup