more TRDS cleanup