Remove some redundant trace code