Bump dependencies and simplify build code