removed all the chart nonsense
removed all the chart nonsense
Fix case issues