Tidy.
Disabled additions until schema fix.