Merge cleaning part 1
Part 2
Cleaning fin