Merge "Remove leftover debugging code"