remove if statemets that weren't needed
Merge pull request #5 from jdguzman/jg-remove-redundant-code

remove if statemets that weren't needed