Removed unnecessary comments and an if() surrounding a block that should be executes unconditionally
Removed unnecessary comments and an if() surrounding a block that should be executes unconditionally

McMutton/fiware-orion,jmcanterafonseca/fiware-orion,telefonicaid/fiware-orion,jmcanterafonseca/fiware-orion,jmcanterafonseca/fiware-orion,telefonicaid/fiware-orion,Fiware/data.Orion,telefonicaid/fiware-orion,McMutton/fiware-orion,telefonicaid/fiware-orion,jmcanterafonseca/fiware-orion,McMutton/fiware-orion,jmcanterafonseca/fiware-orion,jmcanterafonseca/fiware-orion,McMutton/fiware-orion,Fiware/data.Orion,telefonicaid/fiware-orion,Fiware/data.Orion,Fiware/data.Orion,McMutton/fiware-orion,Fiware/data.Orion,McMutton/fiware-orion,telefonicaid/fiware-orion,McMutton/fiware-orion,Fiware/data.Orion