Remove patches for 2007 that don't apply any more