PS & WP Replacement

So I need to replace my water pump and power steering pump. Water Pump is no problem..But I am having trouble getting the Hard Line off the top of the Power Steering Pump. Any Suggestions? Also, pulled off the valve cover because it was loose and was discusted with what I found. I got this XJ around 7 Months ago. There is tons of build up in the valves...Not ready to do a top end yet but can I clean it out some how? Any advise would be greatly appreciated...

91 XJ
4.0 HO AUTO 4X4

Switch to diesel motor oil--highly detergent. Shell Rotella 10w30 or 15w40. Use a quality filter--Wix or Napa Gold.