Update dependencies and remove a few TODOs