ISPN-2281 Update configuration XSD and remove commented code