Remove more debugging code...