Removing useless if statements
Merge remote-tracking branch 'antox/master'