trds: cleanup!

Change-Id: I74cf0f399a924bfd0ba1812f8dd01b066520aa07