In reply to Sealwife:
Had a similar issue with our oil tank, turned out there was a small hole in the top where water was entering. Had to replace the oil pump and clean the line from the tank.
I bought a really cheap pump, (the sort that attaches to a drill), cable tied a hose pipe to a length of wood batten, (to push it right to the bottom of the tank), and ended up pumping out about 40 litres of water.
If you pump into an old bucket before transferring to a drum you can see when you start pumping oil from the bottom. The tank outlet is normally a inch or two above the tank bottom to allow for condensation water to accumulate. You need to get the oil/water interface as far below the outlet as possible, then remove and clean any filters, then run off some oil to check it's free of water contamination.
It's unlikely you do have any algae growth, but if you speak to your oil supplier they'll be able to suggest a suitable additive to deal with it. It's been over 5 years since I did the above and the boilers been fine.
EDIT. Re: containers in your last post, heating oil and diesel are very similar, the containers are fine, there's usually a waste oil tank at your local civic amenenity site for disposal.
Post edited at 15:15