branch awareness cleanup