Completed Part 4 clean up