Removed cruft
Now all eight versions of rewriting are done (but not cleaned up or tested)