- getHostName with command-line available
- clean-up unused code