Clean up part 3