cleaned up some more debugging code