Merge pull request #1514 from clebertsuconic/2.3.x

removing dead code