Scripts/ZulGurub: clean up the code and remove old hacks
Merge pull request #11787 from MitchesD/misc

Scripts/ZulGurub: clean up the old code