remove rewriter ( moving to a submodule )