Removing references to schema-form.

It (or something like it) may be necessary later, but right now it is just making things difficult.