Removed some trace statements