And removed the ip-related fields from the xml as well

Signed-off-by: emanuele <emanuele45@gmail.com>
Just few tweaks to make scrutinizer happy :P

Signed-off-by: emanuele <emanuele45@gmail.com>