Revert "Improvements to charging"
Merge pull request #123 from strands-project/revert-120-hydro-devel

Revert "Improvements to charging"