Merged host and configuration types
Removed unused references