Clean up type interfaces
More minor changes.
Removed generated files.