Working to remove all V1 Passwird logic now that the new Passwird is live