Removed some no longer needed ifdefs.