Remove patch that just changes comment.
Remove SUBST that doesn't match anything any longer.