remove patch cruft