Remove FQDNFormKlass stuff

Except for core/ stuff. Oops.
Unify klasses