remove lots of debugging code