Removed old averaging code to get current peaks

Old code to average current/voltage skeewed the result and made current
peaks undetected.
Cleanup
Additional texts to parse