More flow control removal