Bump dependencies and some cleanup.