Convert all Users2 usage to new model. Remove Users2.