Unnecessary flow control removed