Merge pull request #603 from google/fifo-cleanup

Fifo cleanup