Removed not needed conditions
Merge pull request #240 from thatsIch/alwaystrue

Removed not needed conditions