Some cleanup
Update deps
Merged master