I suggest draining into a clean container and see if you actually find any water. Most often there is none. It is also a bit difficult to get any drainage from the filter by simply opening the valve so either open the bleeder or try working the hand pump to pressurize the housing and push fuel out the drain.

If you do the battery removal make sure that you remove the negative cable from the second battery.

Wheel liner darts pull out much easier when lubed. I've become a huge fan of Tri Flow recently. The stuff seems to just draw right in on metals and seemed to do well on the plastic darts as well.