remaining traces from rebasing