Finish transition to singleton managers