Revert "clean up chart code and prepare for choices"

This reverts commit a85ed43290acce7c060bad0728c22784b0aa5122.