Remove more krb4 bits