Heater core swap or repair?

[ostlar]

If you want to really clean the core out, fill it with a solution made from citric acid powder.

I've used 35% vinegar acid, that also works well, although it smells a bit under the process.