Removed unnecessary code

Removed if-statements that evaluated things we already evaluated higher
up
Merge pull request #1 from aiqueneldar/master

Removed unnecessary code