Medium: CTS: Remove references to deleted classes
Mercurial revision: 1774e0b0357f032138ea3c900662e15c7b47847d