Ok I just removed the heat trap on both the hot and cold side in the second WH and the hot side on the first WH. It was a super easy job just grabbed it with a pair of needle nose pliers and it pulled right out.
Crossing my fingers this does the trick and I am done messing with this!
Crossing my fingers this does the trick and I am done messing with this!