If you are doing the valley pan, the water pump has to come off. Unless they were done recently, I would replace that and the thermostat, along with the two pipes that go from the water pump to the back of the engine ( the ends were corroded on mine).

__________________
David.X5
2001 X5 4.4i Sport
SOLD! at 160k miles