TC Bot refactoring: deprecated class usages removal