PerformanceControl cleanup and fixes