Clean up part 4