removed more debugging structure