cleaned hierarchy of TSD interface