Remove some spurious code
Merge pull request #1470 from mlocati/5.7-remove-spurious-code

[5.7] Remove some spurious code