Fixed copy-pastos.
Merge pull request #2176 from tklein23/cleanup

Fixed copy-pastos.