Cleanup namespace and add telemetry histograms