Yes. We didn't see the need for the leaf spring since we are off-pavement forest service or BLM road people, not Utah slick-rock crawler people. Also, brakes come with the leaf springs and we didn't see the need for those on the trailer either.
We did get the frame upgrade, however.
You can see from the photos that we are set up to carry 5 jerry cans, one with fuel and four with water, for 20 gallons of water, 25 if we aren't concerned about running out of gas. We also always carry five gallons in our van for a total of 25 - 30 gallons. One thing we like about the water in the jerry cans is that they are easy to clean/care for, we have considerable flexibility in how many we take and where we locate them on the trailer, and we have no plumbing to worry about. If something leaks, we throw it away and buy another.
Doug