Cleanup
Update deps