More cleanup, more TRDS work