Correct WMI query XML

Remove some temp debug code
Remove some commented out code
Start re-factoring the index XML and parsing