cleaned  up more of the traces