If your diesel tank is difficult to clean, (i.e if you have to cut 6" holes in each baffled area), here is a work-around: use a portable-plastic tank (like the Moeller 6 gallon), and either fill it at a gas-station/fuel-dock or transfer (with a bulb-pump) from your regular tank as needed; (I highly recommend you filter with a cleanable (glass-type) filter and remove water, like with a "Mr. Funnel", as you transfer). You can run the return line into your existing tank, (or T it into the transfer hose downstream from the bulb-pump...this will minimize the need to re-fill the plastic tank..you may need to add fittings for the transfer and return fuel lines). I did a similar sytem on my previous boat and am in the process of doing it again on my latest boat, bot 1980's vintage. If I ever get around to re-building my regular tank, or just cutting holes and scrubbing then I will have this plastic tank system as a back-up system for under $100.