Remove commented out lines
Add xml export