I tried a combination of both of these without success. I removed the drain fitting and prodded around with a scribe as well as shooting some water in there. I would get a trickle and that was it. Granted, I wasn't too persistent with the scribe or forcefull. Perhaps its time to get a little more violent with it... I'm going to pull the thermostat just in case it's sticking or causing some other trouble and try again.