Get rid of some #ifdef'd usage of a variable that no longer exists