remove trace statements :(