Removed some unused #ifdefs
Merge pull request #323 from TsudaKageyu/ifdefs

Removed some unused #ifdefs