Cleanup
Removed unused imports. Some type cleanup