Also remove references to PasswordException and Stream