remove redundant patch files and replace with one global patch