Removed some trace code