Remove wrappers around done()