Making more PerformanceHub more lightweight