Remove duplicated useless conditional
Merge pull request #458 from Cloudef/cleanup

Remove duplicated useless conditional
Merge pull request #4 from DarkstarProject/master

Merge