tweaks: remove some more annoying conditional compilation
2 files changed