Stripped down any complicated XML
added consensus.xml changes
Cleaned up command line.