Remove last cleanup from btrace code