removed traces from last merge