Clean up of First Chart graph to use new Measurement Service