Fixed up ifdef check to be on one line instead of two
Removed old # defines