General XML clean-up.
Removed main method.