Changed FIFO management to try to remove on exit