-Cleanup of unused classes and imports.
-Last of ugly JSON cleanup.
-A few unresolved errors.