Add vendor patch and delete leftovers