got rid of more debugging code