telemetry: some cleanup