TRDS cleanup