TabController API cleanup
TabController API cleanup