Use the fetchPrimaryManager method in the necessary establishment logic and remove unused comments/methods
Closes VSN-1857