Removed assorted old ifdefs.
2 files changed