Merge "Remove some old debugging code"