removed some trace calls