made context explicit again
removed obsolete Noop() and Done()