refactored out legacy charts