(maint) Removed duplicated function and comments.
Merge pull request #195 from clantant/mait/master/rm_dupe_code

(maint) Removed duplicated function and comments.