It would appear that removing the cylinder plug and draining the fluid from there in addition to the plug on the water pump actually removes little if any additional fluid. I only did the water pump drain and it still took about a gallon to fill it all the way back up, including burping it a few times to make sure all the air was out of the system.