Finished removing chart junk for now.  Closes #216