State before trying to remove MultiAuth
Removed dep on MultiAuth, did a lot of cleanup