removed the trace statements