chart2: remove unnecessary complexity

Change-Id: I4c63fbb31ab49ed70c4e3092c5fe70a2b3514e3d