more cleaning in yield.js