If none of the above work, try my solution. Start prying the edge of the windshield with a screw driver and when it snaps and breaks, go get the BFH and smash out the rest of it. Call the new windshield guy, he will come out and install one brand new and it doesn't have any of those pesky water spots. Good luck, Jeff.
