Remove one redundant parameter in charging computations