Telemetry tool refactoring and baseboard cleanup