removed invalid and unused define, commented out debug code