Fix some more cutting #ifs
Merge pull request #2209 from yebblies/killif

[DDMD] Remove some dead code and cutting #ifs