Commented out lines from fifo branch