clean up some stuff that got hacked while debugging and benchmarking