Make patches apply again.
Remove file that's not installed any longer.