Remove InFlight

No need to take another lock for each line, just shut thing down
properly.