Removed some ifdefs.