Removed some unused #ifdefs