Clean up part 5