Baker told colleagues he will be taking on other duties at the FBI, according to people familiar with the matter. In recent months, Baker had been caught up in a strange interagency dispute that led to a leak probe and attracted the attention of senior lawmakers, but people familiar with the matter said the probe had recently ended with a decision not to charge anyone. The leak issue had not played a part in Baker’s reassignment, these people said.

Baker, one of the most trusted, longest-serving national security officials in the government, has served as the head of the FBI’s Office of General Counsel for several years, playing a key role in the agency’s handling of major cases and policy debates, including the FBI’s unsuccessful battle with Apple over the growing use of encryption in cellphones…

In recent days, conservatives have intensified their calls for a housecleaning of some kind at the senior levels of the FBI. Since Wray became director in August, Baker has told colleagues he expected the new boss would eventually pick someone new for his position.