Remove debug code #4929