Removed two unnecessary trace() calls