Clean up the ext xml syntax
Cleanup