Remove a whole bunch of cutting ifdefs
Merge pull request #2738 from yebblies/moreifdefs

[DDMD] Remove a whole bunch of cutting ifdefs