Remove commented out code. Directive isn't working because I removed
removed a dependent library.
Cleanup references to model and additional/default. The model property
was removed, and additional_properties/default_properties were moved to
its level. In some cases the attributes were called additional/default-
these were renamed.