Ripped out FIFO stuff that we won't use