Remove debug code from previous checkin