I've been told that some S90s use a single in-tank fuel pump whereas others include a second pump that is co-located with the in-line fuel filter. I replaced a fuel filter last night and it looks like my vehicle has only the one pump in that tank. Can anyone confirm?

Also - anyone have a procedure for removing the in-tank pump? Looks like a bugger!