Added support for overriding the host file location
Cleaned up unused references