remove passthru mode - not needed, and move logic out of the rewriter