Considering Demand Term Implicitly for the Hanasaki Reservoir Formulation

Currently, the demand and demand term memory for the Hanasaki formulation are read from the water management file and the abstraction variable provided in this file.
In the current implementation, abstraction is taken from the lake/reservoir. However, this abstraction is later also considered as demand in the Hanasaki term if demand memory is activated, leading to redundancy.
To resolve this, further modifications are needed. When Hanasaki is activated and demand term memory is enabled, the provided demand from the water management file should not be separately added or removed from storage, as it is already accounted for implicitly in the demand term and the Hanasaki formulation.
I welcome any thoughts or suggestions on this.