Yeah, I gave the whole thing a deep cleaning when all the screws rattled loose and I was able to get inside. I also checked the hoses connecting the pump to the heater, and even cleaned the screen on top of the heater to make sure it wasn't creating restriction there, but still no improvement...