4.1.8 XMLs + Major clean up (pt1)