Cleanup of charts Part 1