Cleanup
Update some dependencies