Restore main XML feed to index.xml, some cleanup