Removed some #ifdefs.