Final clean-up #1
Part 3 started