Remove querier/commander altogether.