Yeah, I always pull the fuel pump fuse, and let the car run till it dies (a few seconds). Then I disconnect everything, always very, very slowly to be sure. You still wind up dumping about a cut of gas though, from some in the lines and a good deal inside the filter.