Cleanup and updates to dependencies.