Remove TSDR dependencies