Frameworks/SystemPerformance cleanups