Performance Graph Cleanup

Fixes #3491 and removes redundant code. Again the C&C chrome logic mostly won.