TDQ-9571 code refactor:Remove some unuseful classes and functions