Fifo cleanup

This PR removes the dependency of DataReader in the FIFO.