Merge branch 'pw/patience-diff-clean-up'

Code clean-up. * pw/patience-diff-clean-up: patience diff: remove unused variable patience diff: remove unnecessary string comparisons