1 clean/statements

/cc @MatthewMueller @ianstormtaylor this one does what that last PR did, just removed all the extra junk :-)
only issue with this is we actually yield when we (probably) did not have had to.