get rid of some logging, and do some perf improvements