Minor bug fixes including metric keep discharge issue

What's Changed

Bug fixes

• Change order of force discharge to try to avoid grid spike by @springfall2008 in #1274
• Put back metric keep weighting on discharge by @springfall2008 in #1276

Cleanup

• Cleanup to remove old SIMULATE to be replace by unit tests by @springfall2008 in #1275

Full Changelog: v8.2.1...v8.2.2