patches clean up