further xml cleanup