More rewrites and deletions