Removed unused SchemaDelegate class
Removed dead code.
Fixed unit tests.