Remove calls to flush; it's done automatically now