noop adapter removed, cleanup