Merge "Remove debug code"