So far I have the lower unit off. In order to remove the pump do I have to take out the horizontal shaft that connects to the splined prop shaft? And then take out the vertical shaft? I know the pump is bad...found pieces of metal and plastic on the top of it below a metal plate I removed. Thanks.