corrected return and removed trace info