Remove unneeded usage blocks, fix password length check to match portal