remove #ifdef's that introduce compile errors
2 files changed