Remove patches and cleanup