Fixes and holding back some stuff
Remove comments from XML parsed config files
Remove incorrect node