Remove debugging code ...