Remove some repeated lines.
Merge pull request #588 from cfailde/master

Remove some repeated lines.