Removed unneeded #if's
Merge pull request #4 from azrafe7/master

Removed unneeded #if's