Remove unnecesary flow control (it's in Core)