Clean up code.
Clean up 2
Merge origin/master