Some cleanup
Merge origin/master