Removed code that was duplicated on top of itself.
Merge pull request #668 from ardave/master

Removed code that was duplicated on top of itself.