Removed unnecessary trace calls