removed two old rewriters and associated classes