sanitize: waiting for class/schema unification