Everything now should be working with the new schema.
Some cleanup of classes no longer used.