Cleanup after removing exp. telemetry code