fix: remove duplicated patches from 22a973bedfc4dffb1c78bdd09aca9bafeac2d476
simplify patch applying