Remove some #ifs
Merge pull request #2879 from danzel/patch-1

Remove some #ifs