Draining the tank is often as much as you can do, unless you remove it from the car. Flush anything you want into is, as long as you drain it out. Don't be worried about a few drops of water, not compared to what was in it. To remove the water, maybe make your last flush a bit of clean fuel.
Go for a drive, then change the fuel filter.