Continuing cleaning

- A few more lines deleted
- Reading from default config file when ip specific is not available