Clean up 2

Part 2