I would keep in general.py, because it is a specific implementation of ```count_progress``` meaningful only for the risk calculators. I have removed the old progress counter