Merge "[COMMON] Cleanup charts from unsupported parts"