Remove commented-out debug #define cruft