Update deps
Cleanup