Lots of cleanup and move to fifo_dt.