Lots of clean up in the Google Chart controller.