[NBI] Cleanup the charts regarding AAF/TLS removal