testing fix and cleanup related
chart related