commented out a bunch of trace statements