Remove old code
Removing more old code
Add step two clear