Remove trace stmts