Merge "General cleanup of SDNC charts"