Telemetry refactoring - Fixes #1634

Who wants to have another check before I press the button? Damjan?